resolved conflicts for merge of a1298934 to master
Change-Id: I2e0e2bcc3815d2d4a5f5bf10412c7dc0a248a509
diff --git a/Android.mk b/Android.mk
index 159bda0..4251262 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,6 @@
# limitations under the License.
#
-include cts/CtsNativeTestCase.mk
-include cts/CtsTestCoverage.mk
+include cts/CtsBuild.mk
+include cts/CtsCoverage.mk
include $(call all-subdir-makefiles)
diff --git a/CtsBuild.mk b/CtsBuild.mk
new file mode 100644
index 0000000..b4273bd
--- /dev/null
+++ b/CtsBuild.mk
@@ -0,0 +1,66 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# CTS build rules that are needed to generate the corresponding XML
+# for a test package. CTS needs these XML files to know what tests
+# to run as well as detect which ones were not executed.
+#
+# 1. Replace the regular build command with the CTS variant:
+#
+# BUILD_EXECUTABLE -> BUILD_CTS_EXECUTABLE
+# BUILD_PACKAGE -> BUILD_CTS_PACKAGE
+# BUILD_HOST_JAVA_LIBRARY -> BUILD_HOST_JAVA_LIBRARY
+#
+# 2. Define LOCAL_CTS_TEST_PACKAGE if you are using
+# BUILD_EXECUTABLE or BUILD_HOST_JAVA_LIBRARY.
+#
+BUILD_CTS_EXECUTABLE := $(LOCAL_PATH)/tools/build/test_executable.mk
+BUILD_CTS_PACKAGE := $(LOCAL_PATH)/tools/build/test_package.mk
+BUILD_CTS_HOST_JAVA_LIBRARY := $(LOCAL_PATH)/tools/build/test_host_java_library.mk
+
+# Test XMLs, native executables, and packages will be placed in this
+# directory before creating the final CTS distribution.
+CTS_TESTCASES_OUT := $(HOST_OUT)/cts-testcases
+
+# Scanners of source files for tests which are then inputed into
+# the XML generator to produce test XMLs.
+CTS_NATIVE_TEST_SCANNER := $(HOST_OUT_EXECUTABLES)/cts-native-scanner
+CTS_JAVA_TEST_SCANNER := $(HOST_OUT_EXECUTABLES)/cts-java-scanner
+CTS_JAVA_TEST_SCANNER_DOCLET := $(HOST_OUT_JAVA_LIBRARIES)/cts-java-scanner-doclet.jar
+
+# Generator of test XMLs from scanner output.
+CTS_XML_GENERATOR := $(HOST_OUT_EXECUTABLES)/cts-xml-generator
+
+# File indicating which tests should be blacklisted due to problems.
+CTS_EXPECTATIONS := cts/tests/expectations/knownfailures.txt
+
+# Functions to get the paths of the build outputs.
+
+define cts-get-lib-paths
+ $(foreach lib,$(1),$(HOST_OUT_JAVA_LIBRARIES)/$(lib).jar)
+endef
+
+define cts-get-native-paths
+ $(foreach exe,$(1),$(call intermediates-dir-for,EXECUTABLES,$(exe))/$(exe))
+endef
+
+define cts-get-package-paths
+ $(foreach pkg,$(1),$(CTS_TESTCASES_OUT)/$(pkg).apk)
+endef
+
+define cts-get-test-xmls
+ $(foreach name,$(1),$(CTS_TESTCASES_OUT)/$(name).xml)
+endef
diff --git a/CtsTestCoverage.mk b/CtsCoverage.mk
similarity index 100%
rename from CtsTestCoverage.mk
rename to CtsCoverage.mk
diff --git a/CtsHostLibraryList.mk b/CtsHostLibraryList.mk
deleted file mode 100644
index ac9a700..0000000
--- a/CtsHostLibraryList.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-CTS_HOST_LIBRARY_JARS :=
diff --git a/CtsNativeTestCase.mk b/CtsNativeTestCase.mk
deleted file mode 100644
index f70ec0c..0000000
--- a/CtsNativeTestCase.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Include this file to gain access to functions to build native CTS
-# test packages. Replace "include $(BUILD_EXECUTABLE)" with
-# "include $(BUILD_CTS_EXECUTABLE)".
-
-LOCAL_PATH := $(call my-dir)
-BUILD_CTS_EXECUTABLE := $(LOCAL_PATH)/tools/build/test_executable.mk
-
-CTS_NATIVE_XML_OUT := $(HOST_OUT)/cts-native-xml
-
-CTS_NATIVE_XML_GENERATOR := $(HOST_OUT_EXECUTABLES)/cts-native-xml-generator
-
-define cts-get-native-paths
- $(foreach exe,$(1),$(call intermediates-dir-for,EXECUTABLES,$(exe))/$(exe))
-endef
-
-define cts-get-native-xmls
- $(foreach exe,$(1),$(CTS_NATIVE_XML_OUT)/$(exe).xml)
-endef
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 8a38564..97e1065 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CTS_SECURITY_APPS_LIST := \
+cts_security_apps_list := \
CtsAppAccessData \
CtsAppWithData \
CtsInstrumentationAppDiffCert \
@@ -24,10 +24,27 @@
CtsTargetInstrumentationApp \
CtsUsePermissionDiffCert
-# These test cases will be analyzed by the CTS API coverage tools.
-CTS_COVERAGE_TEST_CASE_LIST := \
- CtsAccelerationTestCases \
+cts_support_packages := \
CtsAccelerationTestStubs \
+ CtsDelegatingAccessibilityService \
+ CtsDeviceAdmin \
+ CtsTestStubs \
+ SignatureTest \
+ TestDeviceSetup \
+ $(cts_security_apps_list)
+
+cts_external_packages := \
+ com.replica.replicaisland
+
+# Any APKs that need to be copied to the CTS distribution's testcases
+# directory but do not require an associated test package XML.
+CTS_TEST_CASE_LIST := \
+ $(cts_support_packages) \
+ $(cts_external_packages)
+
+# Test packages that require an associated test package XML.
+cts_test_packages := \
+ CtsAccelerationTestCases \
CtsAccessibilityServiceTestCases \
CtsAccountManagerTestCases \
CtsAdminTestCases \
@@ -39,6 +56,7 @@
CtsDpiTestCases \
CtsDpiTestCases2 \
CtsDrmTestCases \
+ CtsEffectTestCases \
CtsExampleTestCases \
CtsGestureTestCases \
CtsGraphicsTestCases \
@@ -61,30 +79,38 @@
CtsSecurityTestCases \
CtsSpeechTestCases \
CtsTelephonyTestCases \
- CtsTestStubs \
CtsTextTestCases \
+ CtsThemeTestCases \
CtsUtilTestCases \
CtsViewTestCases \
CtsWebkitTestCases \
CtsWidgetTestCases
-CTS_TEST_CASE_LIST := \
- TestDeviceSetup \
- CtsDelegatingAccessibilityService \
- CtsDeviceAdmin \
- com.replica.replicaisland \
- SignatureTest \
- ApiDemos \
- ApiDemosReferenceTest \
- $(CTS_COVERAGE_TEST_CASE_LIST) \
- $(CTS_SECURITY_APPS_LIST)
+# All APKs that need to be scanned by the coverage utilities.
+CTS_COVERAGE_TEST_CASE_LIST := \
+ $(cts_support_packages) \
+ $(cts_test_packages)
-CTS_NATIVE_EXES := \
- CtsNativeMediaTestCases
+# Host side only tests
+cts_host_libraries := \
+ CtsAppSecurityTests
-CTS_TEST_CASES := $(call cts-get-native-paths,$(CTS_NATIVE_EXES))
+# Native test executables that need to have associated test XMLs.
+cts_native_exes := \
+ NativeMediaTest_SL \
+ NativeMediaTest_XA
-CTS_TEST_XMLS := $(call cts-get-native-xmls,$(CTS_NATIVE_EXES))
+# All the files that will end up under the repository/testcases
+# directory of the final CTS distribution.
+CTS_TEST_CASES := $(call cts-get-lib-paths,$(cts_host_libraries)) \
+ $(call cts-get-package-paths,$(cts_test_packages)) \
+ $(call cts-get-native-paths,$(cts_native_exes))
+
+# All the XMLs that will end up under the repository/testcases
+# and that need to be created before making the final CTS distribution.
+CTS_TEST_XMLS := $(call cts-get-test-xmls,$(cts_host_libraries)) \
+ $(call cts-get-test-xmls,$(cts_test_packages)) \
+ $(call cts-get-test-xmls,$(cts_native_exes))
# The following files will be placed in the tools directory of the CTS distribution
CTS_TOOLS_LIST :=
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 945419b..d9afe8d 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -5,9 +5,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.verifier"
android:versionCode="1"
- android:versionName="4.0.3_r1">
+ android:versionName="1337">
<!-- Using 10 for more complete NFC support... -->
<uses-sdk android:minSdkVersion="10"></uses-sdk>
@@ -28,17 +28,24 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />
+ <uses-feature android:name="android.hardware.camera.front"
+ android:required="false" />
+ <uses-feature android:name="android.hardware.camera.autofocus"
+ android:required="false" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
-
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-feature android:name="android.hardware.usb.accessory" />
+
<!-- Needed by the Audio Quality Verifier to store the sound samples that will be mailed. -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <application android:label="@string/app_name"
+ <application android:label="@string/app_name"
android:icon="@drawable/icon"
- android:backupAgent="VerifierBackupAgent"
+ android:backupAgent="VerifierBackupAgent"
android:debuggable="true">
-
+
+ <uses-library android:name="com.android.future.usb.accessory" />
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIbK6ldcOzoeRtQ1u1dFVJ1A7KetRhit-a1Xa82Q" />
@@ -70,7 +77,7 @@
<provider android:name=".TestResultsProvider"
android:authorities="com.android.cts.verifier.testresultsprovider" />
-
+
<activity android:name=".admin.PolicySerializationTestActivity"
android:label="@string/da_policy_serialization_test"
android:configChanges="keyboardHidden|orientation">
@@ -117,7 +124,7 @@
<meta-data android:name="test_category" android:value="@string/test_category_networking" />
<meta-data android:name="test_required_features" android:value="android.hardware.bluetooth" />
</activity>
-
+
<activity android:name=".bluetooth.BluetoothToggleActivity"
android:label="@string/bt_toggle_bluetooth"
android:configChanges="keyboardHidden|orientation">
@@ -139,7 +146,7 @@
<meta-data android:name="test_category" android:value="@string/bt_device_communication" />
<meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" />
</activity>
-
+
<activity android:name=".bluetooth.InsecureServerActivity"
android:label="@string/bt_insecure_server"
android:configChanges="keyboardHidden|orientation">
@@ -161,7 +168,7 @@
<meta-data android:name="test_category" android:value="@string/bt_device_communication" />
<meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" />
</activity>
-
+
<activity android:name=".bluetooth.InsecureClientActivity"
android:label="@string/bt_insecure_client"
android:configChanges="keyboardHidden|orientation">
@@ -173,11 +180,33 @@
<meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" />
</activity>
+ <activity android:name=".bluetooth.ConnectionAccessServerActivity"
+ android:label="@string/bt_connection_access_server"
+ android:configChanges="keyboardHidden|orientation">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.cts.intent.category.MANUAL_TEST" />
+ </intent-filter>
+ <meta-data android:name="test_category" android:value="@string/bt_device_communication" />
+ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" />
+ </activity>
+
+ <activity android:name=".bluetooth.ConnectionAccessClientActivity"
+ android:label="@string/bt_connection_access_client"
+ android:configChanges="keyboardHidden|orientation">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.cts.intent.category.MANUAL_TEST" />
+ </intent-filter>
+ <meta-data android:name="test_category" android:value="@string/bt_device_communication" />
+ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" />
+ </activity>
+
<activity android:name=".bluetooth.DevicePickerActivity"
android:label="@string/bt_device_picker"
android:configChanges="keyboardHidden|orientation" />
- <activity android:name=".suid.SuidFilesActivity"
+ <activity android:name=".suid.SuidFilesActivity"
android:label="@string/suid_files"
android:configChanges="keyboardHidden|orientation">
<intent-filter>
@@ -272,7 +301,19 @@
<service android:name=".audioquality.ExperimentService" />
<activity android:name=".camera.analyzer.CameraAnalyzerActivity"
- android:label="@string/camera_analyzer">
+ android:label="@string/camera_analyzer"
+ android:screenOrientation="landscape">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.cts.intent.category.MANUAL_TEST" />
+ </intent-filter>
+ <meta-data android:name="test_category" android:value="@string/test_category_camera" />
+
+ <intent-filter>
+ <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
+ </intent-filter>
+ <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
+ android:resource="@xml/accessory_filter_adk" />
</activity>
<activity android:name=".usb.UsbAccessoryTestActivity"
@@ -288,4 +329,4 @@
</application>
-</manifest>
+</manifest>
diff --git a/apps/CtsVerifier/include/colorchecker/autolocktest.h b/apps/CtsVerifier/include/colorchecker/autolocktest.h
new file mode 100644
index 0000000..0d30bd7
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/autolocktest.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AUTOLOCKTEST_H
+#define AUTOLOCKTEST_H
+
+#include <vector>
+
+#include "imagetesthandler.h"
+
+class AutoLockTest : public ImageTestHandler {
+ public:
+ AutoLockTest() : ImageTestHandler() {}
+ AutoLockTest(int debugHeight, int debugWidth) :
+ ImageTestHandler(debugHeight, debugWidth) {}
+ ~AutoLockTest() {}
+
+ void addDataToList(const std::vector<Vec3f>* checkerColors) {
+ mCheckerColors.push_back(*checkerColors);
+ delete checkerColors;
+ }
+
+ void processData();
+
+ void clearData();
+
+ const std::vector<bool>* getComparisonResults() const {
+ return (&mComparisonResults);
+ }
+
+ private:
+ bool IsBrighterThan(const std::vector<Vec3f>* colorCheckers1,
+ const std::vector<Vec3f>* colorCheckers2) const;
+ bool IsEquivalentTo(const std::vector<Vec3f>* colorCheckers1,
+ const std::vector<Vec3f>* colorCheckers2) const;
+
+ std::vector<std::vector<Vec3f> > mCheckerColors;
+ std::vector<bool> mComparisonResults;
+ int mNumPatches;
+};
+
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/colorchecker.h b/apps/CtsVerifier/include/colorchecker/colorchecker.h
deleted file mode 100644
index 5409b04..0000000
--- a/apps/CtsVerifier/include/colorchecker/colorchecker.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef COLORCHECKER_H
-#define COLORCHECKER_H
-
-/** Detects the 6x4 Xrite ColorChecker Classic pattern in the input image,
- * and calculates the average color value per patch.
- *
- * All squares in the colorchecker pattern have to be fully visible,
- * and the whole pattern should fill at least 1/3 of the image
- * width. The pattern cannot be facing away from the camera at a very
- * large angle (>45 degrees). If multiple 6x4 grids can be found, the
- * one that is most front-facing will be returned.
- *
- * The average color is returned as a floating-point value per
- * channel, linearized by an inverse gamma transform and normalized
- * to 0-1 (255 = 1). The linearization is only approximate.
- *
- * @param inputImage Source image to detect the pattern in. Assumed
- * to be a 3-channel interleaved image. Row-major
- * @param width Width of input image
- * @param height Height of input image
- * @param patchColors Output 6x4 3-channel image of average patch
- * values. Allocated by caller. Pass in NULL if
- * the average values aren't needed.
- * @param outputImage Resized inputImage with overlaid grid detection
- * diagnostics. Image width is approximately 160
- * pixels. Pass in NULL if the diagnostic image
- * isn't needed.
- * @param outputWidth Actual width of outputImage.
- * @param outputHeight Actual height of outputImage.
- *
- * @return true if a grid was found, false otherwise. If false, the
- * input variables are unchanged.
- */
-bool findColorChecker(const unsigned char *image,
- int width,
- int rowSpan,
- int height,
- float *patchColors,
- unsigned char **outputImage,
- int *outputWidth,
- int *outputHeight);
-
-
-#endif
diff --git a/apps/CtsVerifier/include/colorchecker/colorcheckertest.h b/apps/CtsVerifier/include/colorchecker/colorcheckertest.h
new file mode 100644
index 0000000..f733b32
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/colorcheckertest.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef COLORCHECKERTEST_H
+#define COLORCHECKERTEST_H
+
+#include <vector>
+#include <string>
+
+#include "testingimage.h"
+#include "imagetesthandler.h"
+
+class ColorCheckerTest : public ImageTestHandler {
+public:
+ ColorCheckerTest() : ImageTestHandler() {
+ mImage = NULL;
+ mSuccess = false;
+ }
+ ColorCheckerTest(int debugHeight, int inputWidth) :
+ ImageTestHandler(debugHeight, inputWidth) {
+ mImage = NULL;
+ mSuccess = false;
+ }
+ ~ColorCheckerTest();
+
+ void addTestingImage(TestingImage* inputImage);
+ void processData();
+
+ const std::vector<std::vector<Vec2f> >* getCheckerCenterAdd() const {
+ std::vector<std::vector<Vec2f> >* returnPositions =
+ new std::vector<std::vector<Vec2f> >(
+ 4, std::vector<Vec2f>(6, Vec2f(0.f, 0.f)));
+
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0; j < 6; ++j) {
+ (*returnPositions)[i][j] = (*mMatchPositions[i][j]);
+ }
+ }
+ return (returnPositions);
+ }
+
+ const std::vector<std::vector<float> >* getCheckerRadiusAdd() const {
+ std::vector<std::vector<float> >* returnRadius=
+ new std::vector<std::vector<float> >(
+ 4, std::vector<float>(6, 0.f));
+
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0; j < 6; ++j) {
+ (*returnRadius)[i][j] = mMatchRadius[i][j];
+ }
+ }
+ return (returnRadius);
+ }
+
+ bool getSuccess() const {
+ return mSuccess;
+ }
+
+private:
+ void initializeRefColor();
+
+ void edgeDetection();
+ void computeGradient(unsigned char* layer, float* gradientMap);
+ void houghLineDetection(bool* edgeMap, float* gradientAbsolute,
+ float* gradientDirection);
+
+ void findCheckerBoards(std::vector<std::vector<int> > linesDir1,
+ std::vector<std::vector<int> > linesDir2);
+ Vec2f findCrossing(std::vector<int> line1, std::vector<int> line2);
+ void findBestMatch(int i1, int i2, int j1, int j2);
+
+ bool verifyPointPair(Vec2f pointUpperLeft, Vec2f pointBottomRight,
+ Vec2f* pointCenter, Vec3i* color);
+ void verifyColorGrid();
+
+ void fillRefColorGrid();
+
+ TestingImage* mImage;
+
+ std::vector<std::vector< Vec3i* > > mCandidateColors;
+ std::vector<std::vector< Vec2f* > > mCandidatePositions;
+
+ std::vector<std::vector< Vec3i* > > mReferenceColors;
+ std::vector<std::vector< Vec2f* > > mMatchPositions;
+ std::vector<std::vector< Vec3f* > > mMatchColors;
+ std::vector<std::vector< float > > mMatchRadius;
+
+ bool mSuccess;
+};
+
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/exposurecompensationtest.h b/apps/CtsVerifier/include/colorchecker/exposurecompensationtest.h
new file mode 100644
index 0000000..0ad70dc
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/exposurecompensationtest.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef EXPOSURECOMPENSATIONTEST_H
+#define EXPOSURECOMPENSATIONTEST_H
+
+#include <vector>
+
+#include "imagetesthandler.h"
+
+class ExposureCompensationTest : public ImageTestHandler {
+ public:
+ ExposureCompensationTest() : ImageTestHandler() {
+ mDebugText = NULL;
+ initializeReferenceColors();
+ }
+ ExposureCompensationTest(int debugHeight, int debugWidth) :
+ ImageTestHandler(debugHeight, debugWidth) {
+ mDebugText = NULL;
+ initializeReferenceColors();
+ }
+ ~ExposureCompensationTest() {}
+
+ void addDataToList(const float exposureValue,
+ const std::vector<Vec3f>* checkerColors) {
+ mExposureValues.push_back(exposureValue);
+ mCheckerColors.push_back(*checkerColors);
+ }
+
+ const char* getDebugText() {
+ return mDebugText;
+ }
+
+ void processData();
+
+ private:
+ void initializeReferenceColors();
+
+ std::vector<std::vector<Vec3f> > mCheckerColors;
+ std::vector<Vec3i> mReferenceColors;
+ std::vector<float> mExposureValues;
+
+ char* mDebugText;
+};
+
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/imagetesthandler.h b/apps/CtsVerifier/include/colorchecker/imagetesthandler.h
new file mode 100644
index 0000000..d66a1d2
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/imagetesthandler.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef IMAGETESTHANDLER_H
+#define IMAGETESTHANDLER_H
+
+#include "vec2.h"
+#include "vec3.h"
+
+class ImageTestHandler{
+ public:
+ ImageTestHandler() {
+ initDebugImage();
+ }
+ ImageTestHandler(int debugHeight, int debugWidth) {
+ initDebugImage(debugHeight, debugWidth);
+ }
+ virtual ~ImageTestHandler() { delete[] mDebugOutput; }
+
+ virtual void processData() {}
+
+ int getDebugWidth() const { return mDebugWidth; }
+ int getDebugHeight() const { return mDebugHeight; }
+ const unsigned char* debug_output() const { return mDebugOutput; }
+ void copyDebugImage(int inputHeight, int inputWidth,
+ const unsigned char* inputImage);
+
+ void drawPoint(const Vec2i &point, const Vec3i &color);
+ void drawPoint(int row, int column, const Vec3i &color);
+ void drawLine(int angle, int radius, const Vec3i &color);
+
+ protected:
+ void clearDebugImage();
+
+ private:
+ void initDebugImage();
+ void initDebugImage(int debugHeight, int debugWidth);
+
+ unsigned char* mDebugOutput;
+ int mDebugWidth;
+ int mDebugHeight;
+};
+
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/meteringtest.h b/apps/CtsVerifier/include/colorchecker/meteringtest.h
new file mode 100644
index 0000000..3115d93
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/meteringtest.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef METERINGTEST_H
+#define METERINGTEST_H
+
+#include <vector>
+
+#include "imagetesthandler.h"
+
+// Constructs a test handler for the metering test. The instance holds the pixel
+// values of the gray checkers on the color checker under different metering
+// settins. It can also compare two arrays of pixel values to tell whether one
+// is brighter or equivalent or darker than the other one.
+class MeteringTest : public ImageTestHandler {
+ public:
+ MeteringTest() : ImageTestHandler() {}
+ MeteringTest(const int debugHeight, const int debugWidth) :
+ ImageTestHandler(debugHeight, debugWidth) {}
+ ~MeteringTest() {}
+
+ void addDataToList(const std::vector<Vec3f>* checkerColors) {
+ mCheckerColors.push_back(*checkerColors);
+ delete checkerColors;
+ }
+
+ void processData();
+
+ void clearData();
+
+ const std::vector<bool>* getComparisonResults() const {
+ return (&mComparisonResults);
+ }
+
+ private:
+ bool isDarkerThan(const std::vector<Vec3f>* checkerColors1,
+ const std::vector<Vec3f>* checkerColors2) const;
+ bool isEquivalentTo(const std::vector<Vec3f>* checkerColors1,
+ const std::vector<Vec3f>* checkerColors2) const;
+
+ std::vector<std::vector<Vec3f> > mCheckerColors;
+ std::vector<bool> mComparisonResults;
+ int mNumPatches;
+};
+
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/testingimage.h b/apps/CtsVerifier/include/colorchecker/testingimage.h
new file mode 100644
index 0000000..f9649d5
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/testingimage.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ** Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TESTINGIMAGE_H
+#define TESTINGIMAGE_H
+
+#include <vector>
+#include "vec3.h"
+#include "vec2.h"
+
+// Implements a class for image representation.
+class TestingImage {
+ public:
+ // Constructs a new instance with the inputImage's row and column counts.
+ // No change in size.
+ TestingImage(const unsigned char* inputImage,
+ int inputWidth, int inputHeight,
+ int inputChannels, int inputRowSpan);
+ // Constructs a new instance with an inputImage but resize it to a given
+ // new size.
+ TestingImage(const unsigned char* inputImage,
+ int inputHeight, int inputWidth,
+ int inputChannel, int inputRowSpan,
+ int newHeight, int newWidth);
+ virtual ~TestingImage();
+
+ // Reads the pixel value of a given location.
+ int getPixelValue(int row, int column, int channel) const;
+ Vec3i getPixelValue(int row, int column) const;
+ Vec3i getPixelValue(const Vec2i &pixelPosition) const;
+ Vec3i getPixelValue(const Vec2f &pixelPosition) const;
+
+ inline const unsigned char* getImage() const { return mImage; }
+ inline int getWidth() const { return mWidth; }
+ inline int getHeight() const { return mHeight; }
+ inline int getChannels() const { return mChannels; }
+ inline int getRowSpan() const { return mRowSpan; }
+
+ // Reads the colors of a color checker in the image with the given checker
+ // coordinates including centers and radius.
+ const std::vector<Vec3f>* getColorChecker(
+ int rowStart, int rowEnd, int columnStart, int columnEnd,
+ const std::vector<std::vector< Vec2f > >* centerAddress,
+ const std::vector<std::vector< float > >* radiusAddress) const;
+
+ // Computes the luminance value of a color image.
+ bool rgbToGrayScale(unsigned char* grayLayer) const;
+
+ private:
+ unsigned char* mImage;
+ int mWidth;
+ int mHeight;
+ int mRowSpan;
+ int mChannels;
+};
+
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/vec2.h b/apps/CtsVerifier/include/colorchecker/vec2.h
new file mode 100644
index 0000000..9de614c
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/vec2.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ** Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VEC2_H
+#define VEC2_H
+
+#include <assert.h>
+#include <cmath>
+
+// Implements a class to represent the location of a pixel.
+template <class T>
+class Vec2{
+ public:
+ Vec2(T inputX, T inputY) {
+ mX = inputX;
+ mY = inputY;
+ }
+
+ Vec2() {}
+
+ inline Vec2<T> operator+ (const Vec2<T> ¶m) const {
+ Vec2<T> temp(mX + param.x(), mY + param.y());
+ return temp;
+ }
+
+ inline Vec2<T> operator- (const Vec2<T> ¶m) const {
+ Vec2<T> temp(mX - param.x(), mY - param.y());
+ return temp;
+ }
+
+ inline Vec2<float> operator/ (const int param) const {
+ Vec2<float> temp();
+ assert(param != 0);
+ temp.set(static_cast<float>(mX) / static_cast<float>(param),
+ static_cast<float>(mY) / static_cast<float>(param));
+
+ return temp;
+ }
+
+ template <class U>
+ float squareDistance(const Vec2<U> ¶m) const {
+ int difference = 0.f;
+ difference = (static_cast<float>(mX) - static_cast<float>(param.x())) *
+ (static_cast<float>(mX) - static_cast<float>(param.x())) +
+ (static_cast<float>(mY) - static_cast<float>(param.y())) *
+ (static_cast<float>(mY) - static_cast<float>(param.y()));
+ return difference;
+ }
+
+ inline T x() const { return mX; }
+ inline T y() const { return mY; }
+
+ inline void set(const T inputX, const T inputY) {
+ mX = inputX;
+ mY = inputY;
+ }
+
+ private:
+ T mX;
+ T mY;
+};
+
+typedef Vec2<int> Vec2i;
+typedef Vec2<float> Vec2f;
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/vec3.h b/apps/CtsVerifier/include/colorchecker/vec3.h
new file mode 100644
index 0000000..1d48188
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/vec3.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ** Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VEC3_H
+#define VEC3_H
+
+#include <assert.h>
+#include <cmath>
+
+// Implementes a class to represent the pixel value in a 3-dimensional color
+// space. The colors are all represented by int as it is mostly used as RGB.
+template <class T>
+class Vec3{
+ public:
+ Vec3(T inputRed, T inputGreen, T inputBlue) {
+ mRed = inputRed;
+ mGreen = inputGreen;
+ mBlue = inputBlue;
+ }
+
+ Vec3() {}
+
+ template <class U>
+ inline Vec3<T> operator+ (const Vec3<U> ¶m) const {
+ Vec3<T> temp(mRed + param.r(), mGreen + param.g(), mBlue + param.b());
+ return temp;
+ }
+
+ inline Vec3<T> operator- (const Vec3<T> ¶m) const {
+ Vec3<T> temp(mRed - param.r(), mGreen - param.g(), mBlue - param.b());
+ return temp;
+ }
+
+ inline Vec3<T> operator* (const int param) const {
+ Vec3<T> temp(mRed * param, mGreen * param, mBlue * param);
+ return temp;
+ }
+
+ template <class U>
+ inline Vec3<float> operator* (const Vec3<U> ¶m) const {
+ Vec3<float> temp(mRed * static_cast<U>(param.r()),
+ mGreen * static_cast<U>(param.g()),
+ mBlue * static_cast<U>(param.b()));
+ return temp;
+ }
+
+
+ inline Vec3<float> operator/ (const int param) const {
+ Vec3<float> temp;
+ assert(param != 0);
+ temp.set(static_cast<float>(mRed) / static_cast<float>(param),
+ static_cast<float>(mGreen) / static_cast<float>(param),
+ static_cast<float>(mBlue) / static_cast<float>(param));
+ return temp;
+ }
+
+ template <class U>
+ inline Vec3<float> operator/ (const Vec3<U> ¶m) const {
+ Vec3<float> temp;
+ assert((param.r() != 0.f) && (param.g() != 0.f) && (param.b() != 0.f));
+ temp.set(static_cast<float>(mRed) / static_cast<float>(param.r()),
+ static_cast<float>(mGreen) / static_cast<float>(param.g()),
+ static_cast<float>(mBlue) / static_cast<float>(param.b()));
+ return temp;
+ }
+
+ template <class U>
+ float squareDistance(const Vec3<U> ¶m) const {
+ float difference = 0.f;
+ difference = static_cast<float>(mRed - param.r()) *
+ static_cast<float>(mRed - param.r()) +
+ static_cast<float>(mGreen - param.g()) *
+ static_cast<float>(mGreen - param.g()) +
+ static_cast<float>(mBlue - param.b()) *
+ static_cast<float>(mBlue - param.b());
+ return difference;
+ }
+
+ // Assumes conversion from sRGB to luminance.
+ float convertToLuminance() const {
+ return (0.299 * static_cast<float>(mRed) +
+ 0.587 * static_cast<float>(mGreen) +
+ 0.114 * static_cast<float>(mBlue));
+ }
+
+ inline T r() const { return mRed; }
+ inline T g() const { return mGreen; }
+ inline T b() const { return mBlue; }
+
+ inline void set(const T inputRed, const T inputGreen, const T inputBlue){
+ mRed = inputRed;
+ mGreen = inputGreen;
+ mBlue = inputBlue;
+ }
+
+ private:
+ T mRed;
+ T mGreen;
+ T mBlue;
+};
+
+typedef Vec3<int> Vec3i;
+typedef Vec3<float> Vec3f;
+#endif
diff --git a/apps/CtsVerifier/include/colorchecker/whitebalancetest.h b/apps/CtsVerifier/include/colorchecker/whitebalancetest.h
new file mode 100644
index 0000000..a347ff0
--- /dev/null
+++ b/apps/CtsVerifier/include/colorchecker/whitebalancetest.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef WHITEBALANCETEST_H
+#define WHITEBALANCETEST_H
+
+#include <vector>
+#include <string>
+
+#include "imagetesthandler.h"
+
+class WhiteBalanceTest : public ImageTestHandler {
+ public:
+ WhiteBalanceTest() : ImageTestHandler() {}
+ WhiteBalanceTest(int debugHeight, int debugWidth) :
+ ImageTestHandler(debugHeight, debugWidth) {}
+ ~WhiteBalanceTest() {}
+
+ void addDataToList(const std::string &mode,
+ const std::vector<Vec3f>* checkerColors) {
+ mMode = mode;
+ mCheckerColors = *checkerColors;
+ delete checkerColors;
+ }
+
+ void processData();
+
+ int getCorrelatedColorTemp() const {
+ return mCorrelatedColorTemp;
+ }
+
+ int getAutoTemp();
+
+ private:
+ int findCorrelatedColorTemp(const Vec3f &whitePoint);
+ Vec3f initializeFromRGB(const Vec3f &rgb);
+ float convertToLinear(float color);
+
+ std::string mMode;
+ std::vector<Vec3f> mCheckerColors;
+ std::vector<Vec3f> mCheckerXyzColors;
+ std::vector<Vec3f> mXyzColorsDaylight;
+ int mCorrelatedColorTemp;
+};
+
+#endif
diff --git a/apps/CtsVerifier/jni/audioquality/LinearityTestRms.cpp b/apps/CtsVerifier/jni/audioquality/LinearityTestRms.cpp
index cf47ec7..d83b056 100644
--- a/apps/CtsVerifier/jni/audioquality/LinearityTestRms.cpp
+++ b/apps/CtsVerifier/jni/audioquality/LinearityTestRms.cpp
@@ -260,10 +260,10 @@
float outDet;
if(!solveLeastSquares(levels, rmsValues, numSignals, NO_COEFFS,
coeffs, &outDet)) {
- LOGI(" solveLeastSquares fails with det %f", outDet);
+ ALOGI(" solveLeastSquares fails with det %f", outDet);
return ERROR_LINEAR_FITTING;
}
- LOGI(" coeffs offset %f linear %f", coeffs[0], coeffs[1]);
+ ALOGI(" coeffs offset %f linear %f", coeffs[0], coeffs[1]);
float maxDev = 0.0f;
for(int i = 0; i < numSignals; i++) {
float residue = coeffs[0] + coeffs[1] * levels[i] - rmsValues[i];
@@ -271,7 +271,7 @@
// then normalize
float devInDb = 20.0f * log10f((fabs(residue) + rmsValues[i])
/ rmsValues[i]);
- LOGI(" %d-th residue %f dB", i, devInDb);
+ ALOGI(" %d-th residue %f dB", i, devInDb);
if (devInDb > maxDev) {
maxDev = devInDb;
}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/Android.mk b/apps/CtsVerifier/jni/cameraanalyzer/Android.mk
index ccc0998..2859074 100644
--- a/apps/CtsVerifier/jni/cameraanalyzer/Android.mk
+++ b/apps/CtsVerifier/jni/cameraanalyzer/Android.mk
@@ -16,12 +16,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+include external/stlport/libstlport.mk
LOCAL_MODULE := libcameraanalyzer
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := com_android_cts_verifier_camera_analyzer_ColorChecker.cpp
+LOCAL_SRC_FILES := com_android_cts_verifier_camera_analyzer_CameraTests.cpp \
+ com_android_cts_verifier_camera_analyzer_ColorCheckerTest.cpp \
+ com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.cpp \
+ com_android_cts_verifier_camera_analyzer_AutoLockTest.cpp \
+ com_android_cts_verifier_camera_analyzer_MeteringTest.cpp \
+ com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.cpp
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include/colorchecker $(JNI_H_INCLUDE)
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_AutoLockTest.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_AutoLockTest.cpp
new file mode 100644
index 0000000..fac39e1
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_AutoLockTest.cpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "AutoLockJNI"
+#include <utils/Log.h>
+#include "com_android_cts_verifier_camera_analyzer_AutoLockTest.h"
+
+#include <vector>
+#include <string>
+#include <string.h>
+
+#include "testingimage.h"
+#include "autolocktest.h"
+#include "vec2.h"
+#include "android/bitmap.h"
+
+jlong Java_com_android_cts_verifier_camera_analyzer_AutoLockTest_createAutoLockTest(
+ JNIEnv* env,
+ jobject thiz) {
+
+ AutoLockTest* testHandler = new AutoLockTest();
+ long handlerAddress = (long)testHandler;
+ return handlerAddress;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_AutoLockTest_createAutoLockClass(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress) {
+
+ ALOGV("JNI createAutoLockClass starts!");
+ long imageAddress = (long)inputImageAddress;
+ long handlerAddress = (long)inputHandlerAddress;
+
+ TestingImage *image = (TestingImage*) imageAddress;
+ AutoLockTest *testHandler = (AutoLockTest*) handlerAddress;
+
+ std::vector<std::vector< Vec2f > >* checkerCenter =
+ (std::vector<std::vector< Vec2f > >*) (long) checkercenterAddress;
+ std::vector<std::vector< float > >* checkerRadius =
+ (std::vector<std::vector< float > >*) (long) checkerradiusAddress;
+ ALOGV("Classes recovered");
+
+ // Uses only the gray patches on the color checker for comparison.
+ testHandler->addDataToList(image->getColorChecker(3, 4, 0, 6,
+ checkerCenter,
+ checkerRadius));
+
+ delete image;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_AutoLockTest_processAutoLockTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress,
+ jbooleanArray tempArray) {
+
+ ALOGV("Processing Auto Lock data!");
+
+ long handlerAddress = (long) inputHandlerAddress;
+ AutoLockTest *testHandler = (AutoLockTest*) handlerAddress;
+
+ testHandler->processData();
+
+ // Converts the native boolean array into a java boolean array.
+ const std::vector<bool>* nativeComparisonResults =
+ testHandler->getComparisonResults();
+ jboolean comparisonResults[nativeComparisonResults->size()];
+
+ for (int i = 0; i < nativeComparisonResults->size(); ++i) {
+ comparisonResults[i] = (jboolean) (*nativeComparisonResults)[i];
+ }
+
+ env->SetBooleanArrayRegion(tempArray,
+ 0, nativeComparisonResults->size(),
+ comparisonResults);
+ testHandler->clearData();
+}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_AutoLockTest.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_AutoLockTest.h
new file mode 100644
index 0000000..dc40bc2
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_AutoLockTest.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_CAMERAANALYZER_AUTOLOCKTEST_H
+#define JNI_CAMERAANALYZER_AUTOLOCKTEST_H
+
+#include <jni.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_AutoLockTest_createAutoLockTest(
+ JNIEnv* env,
+ jobject thiz);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_AutoLockTest_createAutoLockClass(
+ JNIEnv *env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_AutoLockTest_processAutoLockTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress,
+ jbooleanArray tempArray);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp
new file mode 100644
index 0000000..83f5c17
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "CameraTestsJNI"
+#include <utils/Log.h>
+#include "com_android_cts_verifier_camera_analyzer_CameraTests.h"
+#include "android/bitmap.h"
+#include "testingimage.h"
+#include "imagetesthandler.h"
+
+#include <string.h>
+
+jlong Java_com_android_cts_verifier_camera_analyzer_CameraTests_findNative(
+ JNIEnv* env,
+ jobject thiz,
+ jobject inputBitmap) {
+
+ ALOGV("JNI findNative starts!");
+
+ // Verify that we can handle the input bitmap
+ AndroidBitmapInfo inputInfo;
+ AndroidBitmap_getInfo(env, inputBitmap, &inputInfo);
+ if (inputInfo.format != ANDROID_BITMAP_FORMAT_RGBA_8888 &&
+ inputInfo.format != ANDROID_BITMAP_FORMAT_RGB_565) {
+ ALOGE("Only RGBA_8888 and RGB_565 bitmaps are supported, type was %d.",
+ inputInfo.format);
+ }
+
+ // Get some references to the fields and class type of ColorChecker
+ jclass thizCls = env->GetObjectClass(thiz);
+ ALOGV("ColorChecker field and classes reference finished!");
+
+ // Get raw inputs and outputs ready
+ uint8_t *inputBuffer = NULL;
+ int result = AndroidBitmap_lockPixels(
+ env,
+ inputBitmap,
+ reinterpret_cast<void**>(&inputBuffer));
+
+ if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ ALOGE("Unable to lock input bitmap");
+ }
+
+ uint8_t *outputImage = NULL;
+ int outputWidth, outputHeight;
+
+ ALOGV("Input and output images created!");
+
+ // Find the color checker
+ bool success;
+ uint8_t *inputBufferRGBA = NULL;
+ int inputStride;
+ bool freeInputRGBA = false;
+ switch (inputInfo.format) {
+ case ANDROID_BITMAP_FORMAT_RGB_565: {
+ // First convert to RGBA_8888
+ inputBufferRGBA = new uint8_t[inputInfo.width *
+ inputInfo.height *
+ 4];
+ inputStride = inputInfo.width * 4;
+ uint8_t *outP = inputBufferRGBA;
+ for (int y = 0; y < inputInfo.height; y++ ) {
+ uint16_t *inP = (uint16_t*)(&inputBuffer[y * inputInfo.stride]);
+ for (int x = 0; x < inputInfo.width; x++) {
+ *(outP++) = ( ((*inP) >> 0) & 0x001F) << 3;
+ *(outP++) = ( ((*inP) >> 5) & 0x003F) << 2;
+ *(outP++) = ( ((*inP) >> 11) & 0x001F) << 3;
+ outP++;
+ inP++;
+ }
+ }
+ freeInputRGBA = true;
+
+ ALOGV("RGB_565 Format with width, height and stride as %d, %d, %d",
+ inputInfo.width, inputInfo.height, inputStride);
+ break;
+ }
+ case ANDROID_BITMAP_FORMAT_RGBA_8888: {
+ // Already in RGBA
+ inputBufferRGBA = inputBuffer;
+ inputStride = inputInfo.stride;
+ ALOGV("RGB_8888 Format with width, height and stride as %d, %d, %d",
+ inputInfo.width, inputInfo.height, inputStride);
+ break;
+ }
+ }
+
+ TestingImage *input_testing_image =
+ new TestingImage(inputBufferRGBA, inputInfo.height, inputInfo.width,
+ 4, inputStride, 120, 160);
+
+ long lp = (long)input_testing_image;
+
+ result = AndroidBitmap_unlockPixels(env, inputBitmap);
+ if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ ALOGE("Unable to unlock input bitmap");
+ }
+
+ if (freeInputRGBA) {
+ ALOGV("Deleteing inputbufferRGBA");
+ delete[] inputBufferRGBA;
+ }
+
+ return lp;
+ ALOGV("Input format switched!");
+}
+
+jlong Java_com_android_cts_verifier_camera_analyzer_CameraTests_createImageTestHandler(
+ JNIEnv* env,
+ jobject thiz,
+ jint debugHeight,
+ jint debugWidth) {
+
+ ImageTestHandler* testHandler =
+ new ImageTestHandler(debugHeight, debugWidth);
+ long handlerAddress = (long)testHandler;
+ return handlerAddress;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_CameraTests_cleanUpHandler(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+
+ ImageTestHandler* testHandler = (ImageTestHandler*) (long) inputHandlerAddress;
+ delete testHandler;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_CameraTests_displayHandlerDebugOutput(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+
+ jclass thizCls = env->GetObjectClass(thiz);
+ jfieldID outputId = env->GetFieldID(thizCls, "mDebugOutput",
+ "Landroid/graphics/Bitmap;");
+
+ ImageTestHandler* testHandler = (ImageTestHandler*) (long) inputHandlerAddress;
+ uint8_t *outputImage = new uint8_t[testHandler->getDebugHeight() *
+ testHandler->getDebugWidth() * 4];
+
+ const unsigned char *debugoutput = testHandler->debug_output();
+ memcpy(outputImage, debugoutput, testHandler->getDebugHeight() *
+ testHandler->getDebugWidth() * 4);
+
+ int outputWidth = testHandler->getDebugWidth();
+ int outputHeight = testHandler->getDebugHeight();
+ bool success = false;
+
+ if (outputImage == NULL) {
+ ALOGV("output Image is null!");
+ } else {
+ ALOGV("output Image is ready!");
+ }
+
+ // Create debug bitmap from output image data
+ if (outputImage != NULL) {
+ // Get method handles, create inputs to createBitmap
+ jclass bitmapClass =
+ env->FindClass("android/graphics/Bitmap");
+ jclass bitmapConfigClass =
+ env->FindClass("android/graphics/Bitmap$Config");
+
+ jmethodID createBitmap = env->GetStaticMethodID(
+ bitmapClass, "createBitmap",
+ "(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;");
+
+ jmethodID getConfig = env->GetStaticMethodID(
+ bitmapConfigClass, "valueOf",
+ "(Ljava/lang/String;)Landroid/graphics/Bitmap$Config;");
+
+ // Create bitmap config and bitmap
+ jstring bitmapConfigValue = env->NewStringUTF("ARGB_8888");
+ jobject rgbaConfig = env->CallStaticObjectMethod(bitmapConfigClass,
+ getConfig,
+ bitmapConfigValue);
+ jobject outputBitmap = env->CallStaticObjectMethod(bitmapClass,
+ createBitmap,
+ outputWidth,
+ outputHeight,
+ rgbaConfig);
+ // Copy output image into it
+ uint8_t *outputBuffer;
+ int result = AndroidBitmap_lockPixels(
+ env,
+ outputBitmap,
+ reinterpret_cast<void**>(&outputBuffer) );
+
+ if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ ALOGE("Unable to lock output bitmap");
+ }
+
+ memcpy(outputBuffer, outputImage, outputWidth * outputHeight * 4);
+
+ result = AndroidBitmap_unlockPixels(env, outputBitmap);
+ if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ ALOGE("Unable to unlock output bitmap");
+ }
+
+ // Write new Bitmap reference into mDebugOutput class member
+ env->SetObjectField(thiz, outputId, outputBitmap);
+ ALOGV("Copied to outputBitmap");
+ delete [] outputImage;
+ env->DeleteLocalRef(outputBitmap);
+ env->DeleteLocalRef(rgbaConfig);
+ env->DeleteLocalRef(bitmapClass);
+ env->DeleteLocalRef(bitmapConfigClass);
+ }
+}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.h
new file mode 100644
index 0000000..e071dc1
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_CAMERAANALYZER_CAMERATESTS_H
+#define JNI_CAMERAANALYZER_CAMERATESTS_H
+
+#include <jni.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_CameraTests_findNative(
+ JNIEnv *env,
+ jobject thiz,
+ jobject inputBitmap);
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_CameraTests_createImageTestHandler(
+ JNIEnv* env,
+ jobject thiz,
+ jint debugHeight,
+ jint debugWidth);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_CameraTests_cleanUpHandler(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_CameraTests_displayHandlerDebugOutput(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorChecker.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorChecker.cpp
deleted file mode 100644
index 4d247ab..0000000
--- a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorChecker.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "com_android_cts_verifier_camera_analyzer_ColorChecker.h"
-
-#include "utils/Log.h"
-#include "android/bitmap.h"
-#include "colorchecker.h"
-
-jboolean Java_com_android_cts_verifier_camera_analyzer_ColorChecker_findNative(
- JNIEnv* env,
- jobject thiz,
- jobject inputBitmap) {
-
- // Verify that we can handle the input bitmap
- AndroidBitmapInfo inputInfo;
- AndroidBitmap_getInfo(env, inputBitmap, &inputInfo);
- if (inputInfo.format != ANDROID_BITMAP_FORMAT_RGBA_8888 &&
- inputInfo.format != ANDROID_BITMAP_FORMAT_RGB_565) {
- LOGE("Only RGBA_8888 and RGB_565 bitmaps are supported, was given type %d.", inputInfo.format);
- return JNI_FALSE;
- }
-
- // Get some references to the fields and class type of ColorChecker
- jclass thizCls = env->GetObjectClass(thiz);
- jfieldID patchId = env->GetFieldID(thizCls, "mPatchValues", "[F");
- jfieldID outputId = env->GetFieldID(thizCls, "mDebugOutput", "Landroid/graphics/Bitmap;");
- jfloatArray patchValues = (jfloatArray)env->GetObjectField(thiz, patchId);
-
- // Get raw inputs and outputs ready
-
- uint8_t *inputBuffer;
- int result = AndroidBitmap_lockPixels(
- env,
- inputBitmap,
- reinterpret_cast<void**>(&inputBuffer) );
-
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
- LOGE("Unable to lock input bitmap");
- return JNI_FALSE;
- }
-
- float *patchRawArray = env->GetFloatArrayElements(patchValues,
- NULL);
-
- uint8_t *outputImage = NULL;
- int outputWidth, outputHeight;
-
- // Find the color checker
- bool success;
- uint8_t *inputBufferRGBA = NULL;
- int inputStride;
- bool freeInputRGBA = false;
- switch (inputInfo.format) {
- case ANDROID_BITMAP_FORMAT_RGB_565: {
- // First convert to RGBA_8888
- inputBufferRGBA = new uint8_t[inputInfo.width *
- inputInfo.height *
- 4];
- inputStride = inputInfo.width * 4;
- uint8_t *outP = inputBufferRGBA;
- for (int y = 0; y < inputInfo.height; y++ ) {
- uint16_t *inP = (uint16_t*)(&inputBuffer[y * inputInfo.stride]);
- for (int x = 0; x < inputInfo.width; x++) {
- *(outP++) = ( ((*inP) >> 0) & 0x001F) << 3;
- *(outP++) = ( ((*inP) >> 5) & 0x003F) << 2;
- *(outP++) = ( ((*inP) >> 11) & 0x001F) << 3;
- outP++;
- inP++;
- }
- }
- freeInputRGBA = true;
- break;
- }
- case ANDROID_BITMAP_FORMAT_RGBA_8888:
- // Already in RGBA
- inputBufferRGBA = inputBuffer;
- inputStride = inputInfo.stride;
- break;
- }
-
- success = findColorChecker(inputBufferRGBA,
- inputInfo.width,
- inputStride,
- inputInfo.height,
- patchRawArray,
- &outputImage,
- &outputWidth,
- &outputHeight);
-
- // Clean up raw inputs/outputs
- env->ReleaseFloatArrayElements(patchValues, patchRawArray, 0);
- result = AndroidBitmap_unlockPixels(env, inputBitmap);
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
- LOGE("Unable to unlock input bitmap");
- return JNI_FALSE;
- }
-
- if (freeInputRGBA) {
- delete inputBufferRGBA;
- }
-
- // Create debug bitmap from output image data
- if (outputImage != NULL) {
- // Get method handles, create inputs to createBitmap
- jclass bitmapClass =
- env->FindClass("android/graphics/Bitmap");
- jclass bitmapConfigClass =
- env->FindClass("android/graphics/Bitmap$Config");
-
- jmethodID createBitmap = env->GetStaticMethodID(
- bitmapClass, "createBitmap",
- "(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;");
-
- jmethodID getConfig = env->GetStaticMethodID(
- bitmapConfigClass, "valueOf",
- "(Ljava/lang/String;)Landroid/graphics/Bitmap$Config;");
-
- // Create bitmap config and bitmap
- jstring bitmapConfigValue = env->NewStringUTF("ARGB_8888");
- jobject rgbaConfig = env->CallStaticObjectMethod(bitmapConfigClass,
- getConfig,
- bitmapConfigValue);
- jobject outputBitmap = env->CallStaticObjectMethod(bitmapClass,
- createBitmap,
- outputWidth,
- outputHeight,
- rgbaConfig);
- // Copy output image into it
- uint8_t *outputBuffer;
- int result = AndroidBitmap_lockPixels(
- env,
- outputBitmap,
- reinterpret_cast<void**>(&outputBuffer) );
-
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
- LOGE("Unable to lock output bitmap");
- return JNI_FALSE;
- }
-
- memcpy(outputBuffer, outputImage, outputWidth * outputHeight * 4);
-
- result = AndroidBitmap_unlockPixels(env, outputBitmap);
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
- LOGE("Unable to unlock output bitmap");
- return JNI_FALSE;
- }
-
- // Write new Bitmap reference into mDebugOutput class member
- env->SetObjectField(thiz, outputId, outputBitmap);
-
- delete outputImage;
- }
- if (!success) return JNI_FALSE;
-
- return JNI_TRUE;
-}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorChecker.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorChecker.h
deleted file mode 100644
index a9b4487..0000000
--- a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorChecker.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef JNI_CAMERAANALYZER_COLORCHECKER_H
-#define JNI_CAMERAANALYZER_COLORCHECKER_H
-
-#include <jni.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-JNIEXPORT jboolean JNICALL
-Java_com_android_cts_verifier_camera_analyzer_ColorChecker_findNative(
- JNIEnv *env,
- jobject thiz,
- jobject inputBitmap);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JNI_CAMERAANALYZER_COLORCHECKER_H */
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorCheckerTest.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorCheckerTest.cpp
new file mode 100644
index 0000000..94e3ac2
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorCheckerTest.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "FindColorCheckerJNI"
+#include <utils/Log.h>
+#include "com_android_cts_verifier_camera_analyzer_ColorCheckerTest.h"
+
+#include <string.h>
+#include "android/bitmap.h"
+#include "colorcheckertest.h"
+#include "testingimage.h"
+
+jlong Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_createColorCheckerTest(
+ JNIEnv* env,
+ jobject thiz,
+ jint debugHeight,
+ jint debugWidth) {
+ ColorCheckerTest* testHandler = new ColorCheckerTest(debugHeight,
+ debugWidth);
+ long testHandlerAddress = (long)testHandler;
+ return testHandlerAddress;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_createColorCheckerClass(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress) {
+ ALOGV("JNI createColorCheckerClass starts!");
+
+ TestingImage *testImage = (TestingImage*) (long) inputImageAddress;
+ ColorCheckerTest *testHandler = (ColorCheckerTest*)
+ (long) inputHandlerAddress;
+
+ testHandler->addTestingImage(testImage);
+}
+
+jboolean Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_processColorCheckerTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+
+ ColorCheckerTest *testHandler = (ColorCheckerTest*)
+ (long) inputHandlerAddress;
+ testHandler->processData();
+ return testHandler->getSuccess();
+}
+
+jlong Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_getColorCheckerRadiusAdd(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+
+ ColorCheckerTest *testHandler = (ColorCheckerTest*)
+ (long) inputHandlerAddress;
+ long rtn = (long) testHandler->getCheckerRadiusAdd();
+ return rtn;
+}
+
+jlong Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_getColorCheckerCenterAdd(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+
+ ColorCheckerTest *testHandler = (ColorCheckerTest*)
+ (long) inputHandlerAddress;
+
+ long rtn = (long) testHandler->getCheckerCenterAdd();
+ return rtn;
+}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorCheckerTest.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorCheckerTest.h
new file mode 100644
index 0000000..fb87735
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ColorCheckerTest.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_CAMERAANALYZER_COLORCHECKERTEST_H
+#define JNI_CAMERAANALYZER_COLORCHECKERTEST_H
+
+#include <jni.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_createColorCheckerTest(
+ JNIEnv* env,
+ jobject thiz,
+ jint output_height,
+ jint output_width);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_createColorCheckerClass(
+ JNIEnv *env,
+ jobject thiz,
+ jlong buffer_address,
+ jlong handler_address);
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_getColorCheckerRadiusAdd(
+ JNIEnv *env,
+ jobject thiz,
+ jlong handler_address);
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_getColorCheckerCenterAdd(
+ JNIEnv *env,
+ jobject thiz,
+ jlong handler_address);
+
+JNIEXPORT jboolean JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ColorCheckerTest_processColorCheckerTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong handler_address);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.cpp
new file mode 100644
index 0000000..0224639
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "ExposureCompensationJNI"
+#include <utils/Log.h>
+#include <vector>
+#include <string.h>
+
+#include "android/bitmap.h"
+#include "testingimage.h"
+#include "exposurecompensationtest.h"
+#include "vec2.h"
+
+#include "com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.h"
+
+jlong Java_com_android_cts_verifier_camera_analyzer_ExposureCompensationTest_createExposureCompensationTest(
+ JNIEnv* env,
+ jobject thiz,
+ jint debugHeight,
+ jint debugWidth) {
+
+ ExposureCompensationTest* testHandler =
+ new ExposureCompensationTest(debugHeight, debugWidth);
+ long handlerAddress = (long)testHandler;
+
+ return handlerAddress;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_ExposureCompensationTest_createExposureCompensationClass(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress,
+ jlong checkerCenterAddress,
+ jlong checkerRadiusAddress,
+ jfloat exposureValue) {
+
+ ALOGV("JNI createExposureCompensationClass starts!");
+
+ long imageAddress = (long)inputImageAddress;
+ long handlerAddress = (long)inputHandlerAddress;
+
+ TestingImage *inputImage = (TestingImage*) imageAddress;
+ ExposureCompensationTest *testHandler =
+ (ExposureCompensationTest*) handlerAddress;
+
+ std::vector<std::vector< Vec2f > >* checkerCenter =
+ (std::vector<std::vector< Vec2f > >*) (long) checkerCenterAddress;
+ std::vector<std::vector< float > >* checkerRadius =
+ (std::vector<std::vector< float > >*) (long) checkerRadiusAddress;
+
+ const std::vector<Vec3f>* checkerValue =
+ inputImage->getColorChecker(3, 4, 0, 6,
+ checkerCenter, checkerRadius);
+ testHandler->addDataToList((float) exposureValue, checkerValue);
+ delete inputImage;
+ delete checkerValue;
+}
+
+jstring Java_com_android_cts_verifier_camera_analyzer_ExposureCompensationTest_processExposureCompensationTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+
+ long handlerAddress = (long) inputHandlerAddress;
+ ExposureCompensationTest *testHandler =
+ (ExposureCompensationTest*) handlerAddress;
+
+ testHandler->processData();
+
+ const char* nativeDebugText = testHandler->getDebugText();
+ ALOGV("%s", nativeDebugText);
+ return env->NewStringUTF(nativeDebugText);
+}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.h
new file mode 100644
index 0000000..8e8761d
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_ExposureCompensationTest.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_CAMERAANALYZER_EXPOSURECOMPENSATIONTEST_H
+#define JNI_CAMERAANALYZER_EXPOSURECOMPENSATIONTEST_H
+
+#include <jni.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ExposureCompensationTest_createExposureCompensationTest(
+ JNIEnv* env,
+ jobject thiz,
+ jint debugHeight,
+ jint debugWidth);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ExposureCompensationTest_createExposureCompensationClass(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress,
+ jlong checkerCenterAddress,
+ jlong checkerRadiusAddress,
+ jfloat exposureValue);
+
+
+JNIEXPORT jstring JNICALL
+Java_com_android_cts_verifier_camera_analyzer_ExposureCompensationTest_processExposureCompensationTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_MeteringTest.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_MeteringTest.cpp
new file mode 100644
index 0000000..faebe21
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_MeteringTest.cpp
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "MeteringJNI"
+#include <utils/Log.h>
+#include "com_android_cts_verifier_camera_analyzer_MeteringTest.h"
+
+#include <vector>
+#include <string>
+#include <string.h>
+#include <math.h>
+
+#include "testingimage.h"
+#include "meteringtest.h"
+#include "vec2.h"
+#include "android/bitmap.h"
+
+jlong Java_com_android_cts_verifier_camera_analyzer_MeteringTest_createMeteringTest(
+ JNIEnv* env,
+ jobject thiz) {
+
+ MeteringTest* testHandler = new MeteringTest();
+ long handlerAddress = (long)testHandler;
+ return handlerAddress;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_MeteringTest_createMeteringClass(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress){
+
+ ALOGV("JNI createMeteringClass starts!");
+ long imageAddress = (long)inputImageAddress;
+ long handlerAddress = (long)inputHandlerAddress;
+
+ TestingImage *image = (TestingImage*) imageAddress;
+ MeteringTest *testHandler = (MeteringTest*) handlerAddress;
+
+ std::vector<std::vector< Vec2f > >* checkerCenter =
+ (std::vector<std::vector< Vec2f > >*) (long) checkercenterAddress;
+ std::vector<std::vector< float > >* checkerRadius =
+ (std::vector<std::vector< float > >*) (long) checkerradiusAddress;
+ ALOGV("Classes recovered");
+
+ testHandler->addDataToList(image->getColorChecker(3, 4, 0, 6,
+ checkerCenter,
+ checkerRadius));
+
+ delete image;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_MeteringTest_processMeteringTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress,
+ jbooleanArray tempArray) {
+
+ ALOGV("Processing Auto Lock data!");
+
+ long handlerAddress = (long) inputHandlerAddress;
+ MeteringTest *testHandler = (MeteringTest*) handlerAddress;
+
+ testHandler->processData();
+
+ const std::vector<bool>* nativeComparisonResults =
+ testHandler->getComparisonResults();
+ jboolean jComparisonResults[nativeComparisonResults->size()];
+
+ for (int i = 0; i < nativeComparisonResults->size(); ++i) {
+ jComparisonResults[i] = (jboolean) (*nativeComparisonResults)[i];
+ }
+
+ env->SetBooleanArrayRegion(tempArray,
+ 0, nativeComparisonResults->size(),
+ jComparisonResults);
+ testHandler->clearData();
+}
+
+// Find the gray checker borders from the native array of checker center and
+// radius. Convert the coordinate to the coordinates accepted by Android
+// Camera.Area type, which defines the top left corner to (-1000, -1000) and
+// bottom right corner to (1000, 1000).
+void Java_com_android_cts_verifier_camera_analyzer_MeteringTest_findGreyCoordinates(
+ JNIEnv* env,
+ jobject thiz,
+ jintArray greyCoordinates,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress){
+
+ ALOGV("Start finding grey coordinates");
+
+ std::vector<std::vector< Vec2f > >* checkerCenter =
+ (std::vector<std::vector< Vec2f > >*) (long) checkercenterAddress;
+ std::vector<std::vector< float > >* checkerRadius =
+ (std::vector<std::vector< float > >*) (long) checkerradiusAddress;
+
+ ALOGV("Checker recovered!");
+ int nativeGreyCoordinates[24];
+
+ for (int i = 0; i < 6; ++i) {
+ float radius = sqrt((*checkerRadius)[3][i]);
+ nativeGreyCoordinates[i * 4] = static_cast<int>(
+ ((*checkerCenter)[3][i].y() - radius)
+ / 160.0 * 2000.0 - 1000.0);
+ nativeGreyCoordinates[i * 4 + 1] = static_cast<int>(
+ ((*checkerCenter)[3][i].x() - radius)
+ / 120.0 * 2000.0 - 1000.0);
+ nativeGreyCoordinates[i * 4 + 2] = static_cast<int>(
+ ((*checkerCenter)[3][i].y() + radius)
+ / 160.0 * 2000.0 - 1000.0);
+ nativeGreyCoordinates[i * 4 + 3] = static_cast<int>(
+ ((*checkerCenter)[3][i].x() + radius)
+ / 120.0 * 2000.0 - 1000.0);
+
+ ALOGV("checker is bounded by %f, %f, %f",
+ (*checkerCenter)[3][i].x(), (*checkerCenter)[3][i].y(), radius);
+
+ ALOGV("Square is bounded by %d, %d, %d, %d",
+ nativeGreyCoordinates[i * 4], nativeGreyCoordinates[i * 4 + 1],
+ nativeGreyCoordinates[i * 4 + 2],
+ nativeGreyCoordinates[i * 4 + 3]);
+ }
+
+ env->SetIntArrayRegion(greyCoordinates, 0, 24, nativeGreyCoordinates);
+}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_MeteringTest.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_MeteringTest.h
new file mode 100644
index 0000000..ecc1b96
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_MeteringTest.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_CAMERAANALYZER_METERINGTEST_H
+#define JNI_CAMERAANALYZER_METERINGTEST_H
+
+#include <jni.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_MeteringTest_createMeteringTest(
+ JNIEnv* env,
+ jobject thiz);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_MeteringTest_createMeteringClass(
+ JNIEnv *env,
+ jobject thiz,
+ jlong inputAddress,
+ jlong handlerAddress,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_MeteringTest_processMeteringTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong handlerAddress,
+ jbooleanArray tempArray);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_MeteringTest_findGreyCoordinates(
+ JNIEnv* env,
+ jobject thiz,
+ jintArray greyCoordinates,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.cpp
new file mode 100644
index 0000000..bce0fca
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "WhiteBalanceJNI"
+#include <utils/Log.h>
+#include "com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.h"
+
+#include <vector>
+#include <string>
+#include <string.h>
+
+#include "testingimage.h"
+#include "whitebalancetest.h"
+#include "vec2.h"
+#include "android/bitmap.h"
+
+jlong Java_com_android_cts_verifier_camera_analyzer_WhiteBalanceTest_createWhiteBalanceTest(
+ JNIEnv* env,
+ jobject thiz) {
+
+ WhiteBalanceTest* testHandler = new WhiteBalanceTest();
+ long handlerAddress = (long)testHandler;
+ return handlerAddress;
+}
+
+void Java_com_android_cts_verifier_camera_analyzer_WhiteBalanceTest_createWhiteBalanceClass(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputImageAddress,
+ jlong inputHandlerAddress,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress,
+ jstring whiteBalance){
+
+ ALOGV("JNI createWhiteBalanceClass starts!");
+ long imageAddress = (long)inputImageAddress;
+ long handlerAddress = (long)inputHandlerAddress;
+
+ TestingImage *image = (TestingImage*) imageAddress;
+ WhiteBalanceTest *testHandler = (WhiteBalanceTest*) handlerAddress;
+
+ std::vector<std::vector< Vec2f > >* checkerCenter =
+ (std::vector<std::vector< Vec2f > >*) (long) checkercenterAddress;
+ std::vector<std::vector< float > >* checkerRadius =
+ (std::vector<std::vector< float > >*) (long) checkerradiusAddress;
+ ALOGV("Classes recovered");
+
+ jboolean isCopy;
+ const char* stringWhiteBalance =
+ env->GetStringUTFChars(whiteBalance, &isCopy);
+ ALOGV("White Balance is %s", stringWhiteBalance);
+
+ // Adds the gray checker's RGB values to the test handler.
+ testHandler->addDataToList(stringWhiteBalance,
+ image->getColorChecker(3, 4, 0, 6,
+ checkerCenter,
+ checkerRadius));
+
+ env->ReleaseStringUTFChars(whiteBalance, stringWhiteBalance);
+ delete image;
+}
+
+jint Java_com_android_cts_verifier_camera_analyzer_WhiteBalanceTest_processWhiteBalanceTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong inputHandlerAddress) {
+ ALOGV("Processing white balance test");
+
+ long handlerAddress = (long) inputHandlerAddress;
+ WhiteBalanceTest *testHandler = (WhiteBalanceTest*) handlerAddress;
+
+ testHandler->processData();
+
+ ALOGV("CCT is %d", testHandler->getCorrelatedColorTemp());
+ return testHandler->getCorrelatedColorTemp();
+}
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.h b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.h
new file mode 100644
index 0000000..88cf52e
--- /dev/null
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_WhiteBalanceTest.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_CAMERAANALYZER_WHITEBALANCETEST_H
+#define JNI_CAMERAANALYZER_WHITEBALANCETEST_H
+
+#include <jni.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_com_android_cts_verifier_camera_analyzer_WhiteBalanceTest_createWhiteBalanceTest(
+ JNIEnv* env,
+ jobject thiz);
+
+JNIEXPORT void JNICALL
+Java_com_android_cts_verifier_camera_analyzer_WhiteBalanceTest_createWhiteBalanceClass(
+ JNIEnv *env,
+ jobject thiz,
+ jlong inputAddress,
+ jlong handlerAddress,
+ jlong checkercenterAddress,
+ jlong checkerradiusAddress,
+ jstring whiteBalance);
+
+JNIEXPORT jint JNICALL
+Java_com_android_cts_verifier_camera_analyzer_WhiteBalanceTest_processWhiteBalanceTest(
+ JNIEnv* env,
+ jobject thiz,
+ jlong handlerAddress);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/apps/CtsVerifier/lib/colorchecker/Android.mk b/apps/CtsVerifier/lib/colorchecker/Android.mk
index 97f0089..38f595f 100644
--- a/apps/CtsVerifier/lib/colorchecker/Android.mk
+++ b/apps/CtsVerifier/lib/colorchecker/Android.mk
@@ -24,7 +24,16 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libcolorchecker
-LOCAL_SRC_FILES += colorchecker.cpp
+LOCAL_SRC_FILES += testingimage.cpp \
+ vec3.cpp \
+ vec2.cpp \
+ imagetesthandler.cpp \
+ colorcheckertest.cpp \
+ exposurecompensationtest.cpp \
+ autolocktest.cpp \
+ meteringtest.cpp \
+ whitebalancetest.cpp
+
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include/colorchecker
LOCAL_SHARED_LIBRARIES := libstlport \
libcutils \
diff --git a/apps/CtsVerifier/lib/colorchecker/autolocktest.cpp b/apps/CtsVerifier/lib/colorchecker/autolocktest.cpp
new file mode 100644
index 0000000..6bfa922
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/autolocktest.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "AutoLockTest"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <cmath>
+#include <string>
+
+#include "vec2.h"
+#include "vec3.h"
+#include "autolocktest.h"
+
+const float kOverExposure = 230.f;
+const float kEqThreshold = 0.05f;
+// Processes the color checker values and compare the two values from
+// the same individual test.
+void AutoLockTest::processData() {
+ ALOGV("Start Processing Auto Lock Test Data!");
+
+ int numTests = mCheckerColors.size() / 2;
+ mNumPatches = 0;
+
+ if (numTests > 0) {
+ mNumPatches = mCheckerColors[0].size();
+ }
+
+ for (int i = 0; i < numTests; ++i) {
+ mComparisonResults.push_back(
+ IsBrighterThan((&mCheckerColors[i * 2]),
+ (&mCheckerColors[i * 2 + 1])));
+ mComparisonResults.push_back(
+ IsEquivalentTo((&mCheckerColors[i * 2]),
+ (&mCheckerColors[i * 2 + 1])));
+ }
+}
+
+// Compares whether one array of gray color patches is brighter than
+// another one.
+bool AutoLockTest::IsBrighterThan(
+ const std::vector<Vec3f>* colorCheckers1,
+ const std::vector<Vec3f>* colorCheckers2) const {
+ float meanRatio = 0.f;
+ int meanNumCount = 0;
+
+ for (int i = 0; i < mNumPatches; ++i) {
+ float luminance1 = (*colorCheckers1)[i].convertToLuminance();
+ float luminance2 = (*colorCheckers2)[i].convertToLuminance();
+
+ // Consider a 5% raise as a considerably large increase.
+ if ((luminance1 < kOverExposure) && (luminance2 != 0.f)) {
+ meanRatio += luminance1 / luminance2;
+ ++meanNumCount;
+ }
+ }
+ meanRatio = meanRatio / meanNumCount;
+
+ return (meanRatio > 1 + kEqThreshold);
+}
+
+// Compares whether one array of gray color patches is within a small range
+// of the other one to be considered equivalent.
+bool AutoLockTest::IsEquivalentTo(
+ const std::vector<Vec3f>* colorCheckers1,
+ const std::vector<Vec3f>* colorCheckers2) const {
+ float meanRatio = 0.f;
+ int meanNumCount = 0;
+
+ for (int i = 0; i < mNumPatches; ++i) {
+ float luminance1 = (*colorCheckers1)[i].convertToLuminance();
+ float luminance2 = (*colorCheckers2)[i].convertToLuminance();
+ ALOGV("Luma_1 and Luma_2 is %f, %f", luminance1, luminance2);
+
+ if ((luminance1 < kOverExposure) && (luminance2 < kOverExposure)) {
+ meanRatio += luminance2 / luminance1;
+ ++meanNumCount;
+ }
+ }
+ meanRatio = meanRatio / meanNumCount;
+
+ return ((meanRatio >= 1 - kEqThreshold) && (meanRatio <= 1 + kEqThreshold));
+}
+
+void AutoLockTest::clearData() {
+ mCheckerColors.clear();
+ mComparisonResults.clear();
+}
diff --git a/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp b/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp
deleted file mode 100644
index 1e0ae97..0000000
--- a/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//#define LOG_NDEBUG 0
-#include <utils/Log.h>
-#include <utils/Timers.h>
-
-#include "colorchecker.h"
-#include "grouping.h"
-#include <string>
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <cmath>
-
-const int totalChannels = 4; // Input image channel count
-const int colorChannels = 3; // Input image color channel count
-const float gammaCorrection = 2.2; // Assumed gamma curve on input
-const int thresholdSq = 675; // Threshold on pixel difference to be considered
- // part of the same patch
-
-class PixelId {
- public:
- int id;
- const unsigned char *p;
-
- PixelId(): id(0), p(NULL) {}
-
- bool operator!=(const PixelId &other) const {
- int dR = ((int)p[0] - other.p[0]) * ((int)p[0] - other.p[0]);
- int dG = ((int)p[1] - other.p[1]) * ((int)p[1] - other.p[1]);
- int dB = ((int)p[2] - other.p[2]) * ((int)p[2] - other.p[2]);
- int distSq = dR + dG + dB;
- if (distSq > thresholdSq) return true;
- else return false;
- }
-};
-
-class ImageField: public Field<PixelId> {
- public:
- ImageField(int width, int height, const unsigned char *data):
- mWidth(width), mHeight(height), pData(data) {
- }
-
- PixelId operator() (int y, int x) const {
- PixelId pId;
- pId.p = pData + (y * mWidth + x ) * totalChannels;
- if (mask.size() != 0) {
- pId.id = mask[y][x];
- }
- return pId;
- }
-
- int getWidth() const { return mWidth; }
- int getHeight() const { return mHeight; }
- private:
- int mWidth;
- int mHeight;
- const unsigned char *pData;
-};
-
-class PixelGroup {
- public:
- PixelGroup(int id, const ImageField *src):
- mId(id),
- mMinX(1e7),
- mMinY(1e7),
- mMaxX(0),
- mMaxY(0),
- mArea(0),
- mSrc(src),
- mRNeighbor(NULL),
- mDNeighbor(NULL),
- mLNeighbor(NULL),
- mUNeighbor(NULL) {
- mSum[0] = 0;
- mSum[1] = 0;
- mSum[2] = 0;
- }
-
- struct IdCompare {
- bool operator() (const PixelGroup* l, const PixelGroup* r) const {
- return l->getId() < r->getId();
- }
- };
-
- void growGroup(int x, int y) {
- if (x < mMinX) mMinX = x;
- if (x > mMaxX) mMaxX = x;
- if (y < mMinY) mMinY = y;
- if (y > mMaxY) mMaxY = y;
- mArea++;
- const unsigned char *p = (*mSrc)(y,x).p;
- mSum[0] += p[0];
- mSum[1] += p[1];
- mSum[2] += p[2];
- }
-
- int getId() const {
- return mId;
- }
-
- int getArea() const {
- return mArea;
- }
-
- int getBoundArea() const {
- return (mMaxX - mMinX) * (mMaxY - mMinY);
- }
-
- float getApproxAspectRatio() const {
- return ((float)(mMaxY - mMinY)) / (mMaxX - mMinX);
- }
-
- void getApproxCenter(int *x, int *y) const {
- *x = (mMaxX + mMinX)/2;
- *y = (mMaxY + mMinY)/2;
- }
-
- void getBoundingBox(int *x1, int *y1, int *x2, int *y2) const {
- *x1 = mMinX;
- *x2 = mMaxX;
- *y1 = mMinY;
- *y2 = mMaxY;
- }
-
- void getAvgValue(unsigned char *p) const {
- p[0] = mSum[0] / mArea;
- p[1] = mSum[1] / mArea;
- p[2] = mSum[2] / mArea;
- }
-
- bool operator<(const PixelGroup &other) const {
- return mArea < other.getArea();
- }
-
- typedef std::set<PixelGroup*, PixelGroup::IdCompare> IdSet;
- typedef std::set<PixelGroup*, PixelGroup::IdCompare>::iterator IdSetIter;
-
- void findNeighbors(IdSet &candidates) {
- int cX, cY;
- getApproxCenter(&cX, &cY);
- int rDistSq = 1e9; // Larger than any reasonable image distance
- int dDistSq = rDistSq;
-
- for (IdSetIter neighbor = candidates.begin();
- neighbor != candidates.end();
- neighbor++) {
- if (*neighbor == this) continue;
- int nX, nY;
- (*neighbor)->getApproxCenter(&nX, &nY);
- // 'right' means slope between (-1/3, 1/3), positive X change
- if ( (nX - cX) > 0 ) {
- float slope = ((float)(nY - cY)) / (nX - cX);
- if (slope > -0.33 && slope < 0.33) {
- int distSq = (nX - cX) * (nX - cX) + (nY - cY) * (nY - cY);
- if (distSq < rDistSq) {
- setRNeighbor(*neighbor);
- rDistSq = distSq;
- }
- }
- }
- // 'down' means inv slope between (-1/3, 1/3), positive Y change
- if ( (nY - cY) > 0) {
- float invSlope = ((float)(nX - cX)) / (nY - cY);
- if (invSlope > -0.33 && invSlope < 0.33) {
- int distSq = (nX - cX) * (nX - cX) + (nY - cY) * (nY - cY);
- if (distSq < dDistSq) {
- setDNeighbor(*neighbor);
- dDistSq = distSq;
- }
- }
- }
- }
- // Do reverse links if possible
- if (getRNeighbor() != NULL) {
- getRNeighbor()->setLNeighbor(this);
- }
- if (getDNeighbor() != NULL) {
- getDNeighbor()->setUNeighbor(this);
- }
-
- }
-
- void setRNeighbor(PixelGroup *rNeighbor) {
- mRNeighbor = rNeighbor;
- }
-
- PixelGroup* getRNeighbor(int distance = 1) {
- PixelGroup *current = this;
- for (int i=0; i < distance; i++) {
- if (current != NULL) {
- current = current->mRNeighbor;
- } else break;
- }
- return current;
- }
-
- void setDNeighbor(PixelGroup *dNeighbor) {
- mDNeighbor = dNeighbor;
- }
-
- PixelGroup* getDNeighbor(int distance = 1) {
- PixelGroup *current = this;
- for (int i=0; i < distance; i++) {
- if (current != NULL) {
- current = current->mDNeighbor;
- } else break;
- }
- return current;
- }
-
- void setLNeighbor(PixelGroup *lNeighbor) {
- mLNeighbor = lNeighbor;
- }
-
- PixelGroup* getLNeighbor(int distance = 1) {
- PixelGroup *current = this;
- for (int i=0; i < distance; i++) {
- if (current != NULL) {
- current = current->mLNeighbor;
- } else break;
- }
- return current;
- }
-
- void setUNeighbor(PixelGroup *uNeighbor) {
- mUNeighbor = uNeighbor;
- }
-
- PixelGroup* getUNeighbor(int distance = 1) {
- PixelGroup *current = this;
- for (int i=0; i < distance; i++) {
- if (current != NULL) {
- current = current->mUNeighbor;
- } else break;
- }
- return current;
- }
-
- float distanceSqTo(const PixelGroup* other) {
- int mX, mY;
- getApproxCenter(&mX, &mY);
- int oX, oY;
- other->getApproxCenter(&oX, &oY);
- int dx = (oX - mX);
- int dy = (oY - mY);
- return dx * dx + dy * dy;
- }
-
- float distanceTo(const PixelGroup* other) {
- return sqrt( distanceSqTo(other) );
- }
-
- private:
- int mId;
- int mMinX, mMinY;
- int mMaxX, mMaxY;
- int mArea;
- int mSum[3];
- const ImageField *mSrc;
-
- PixelGroup *mRNeighbor;
- PixelGroup *mDNeighbor;
- PixelGroup *mLNeighbor;
- PixelGroup *mUNeighbor;
-};
-
-/* Scales input down by factor of outScale to output. Assumes input size is
- * exactly output size times scale */
-void downsample(const unsigned char *input,
- unsigned char *output,
- int rowSpan,
- int outWidth,
- int outHeight,
- int outScale) {
- for (int oY = 0, iY = 0; oY < outHeight; oY++, iY += outScale) {
- for (int oX = 0, iX = 0; oX < outWidth; oX++, iX += outScale) {
- short out[3] = {0,0,0};
- const unsigned char *in = input + iY * rowSpan + iX * totalChannels;
- for (int j = 0; j < outScale; j++) {
- for (int k = 0; k < outScale; k++) {
- for (int i = 0; i < colorChannels; i++) {
- out[i] += in[i];
- }
- in += totalChannels;
- }
- in += rowSpan - outScale * totalChannels;
- }
- output[0] = out[0] / (outScale * outScale);
- output[1] = out[1] / (outScale * outScale);
- output[2] = out[2] / (outScale * outScale);
- output += totalChannels;
- }
- }
-}
-
-void drawLine(unsigned char *image,
- int rowSpan,
- int x0, int y0,
- int x1, int y1,
- int r, int g, int b) {
- if ((x0 == x1) && (y0 == y1)) {
- unsigned char *p = &image[(y0 * rowSpan + x0) * totalChannels];
- if (r != -1) p[0] = r;
- if (g != -1) p[1] = g;
- if (b != -1) p[2] = b;
- return;
- }
- if ( std::abs(x1-x0) > std::abs(y1-y0) ) {
- if (x0 > x1) {
- std::swap(x0, x1);
- std::swap(y0, y1);
- }
- float slope = (float)(y1 - y0) / (x1 - x0);
- for (int x = x0; x <= x1; x++) {
- int y = y0 + slope * (x - x0);
- unsigned char *p = &image[(y * rowSpan + x) * totalChannels];
- if (r != -1) p[0] = r;
- if (g != -1) p[1] = g;
- if (b != -1) p[2] = b;
- }
- } else {
- if (y0 > y1) {
- std::swap(x0, x1);
- std::swap(y0, y1);
- }
- float invSlope = (float)(x1 - x0) / (y1 - y0);
- for (int y = y0; y <= y1; y++) {
- int x = x0 + invSlope * (y - y0);
- unsigned char *p = &image[(y*rowSpan + x) * totalChannels];
- if (r != -1) p[0] = r;
- if (g != -1) p[1] = g;
- if (b != -1) p[2] = b;
- }
- }
-
-}
-bool findColorChecker(const unsigned char *image,
- int width,
- int rowSpan,
- int height,
- float *patchColors,
- unsigned char **outputImage,
- int *outputWidth,
- int *outputHeight) {
- int64_t startTime = systemTime();
-
- const int outTargetWidth = 160;
- const int outScale = width / outTargetWidth;
- const int outWidth = width / outScale;
- const int outHeight = height / outScale;
- LOGV("Debug image dimensions: %d, %d", outWidth, outHeight);
-
- unsigned char *output = new unsigned char[outWidth * outHeight * totalChannels];
-
- unsigned char *outP;
- unsigned char *inP;
-
- // First step, downsample for speed/noise reduction
- downsample(image, output, rowSpan, outWidth, outHeight, outScale);
-
- // Find connected components (groups)
- ImageField outField(outWidth, outHeight, output);
- Grouping(&outField);
-
- // Calculate component bounds and areas
- std::vector<PixelGroup> groups;
- groups.reserve(outField.id_no);
- for (int i = 0; i < outField.id_no; i++) {
- groups.push_back(PixelGroup(i + 1, &outField));
- }
-
- inP = output;
- for (int y = 0; y < outHeight; y++) {
- for (int x = 0; x < outWidth; x++) {
- groups[ outField(y, x).id - 1].growGroup(x, y);
- }
- }
-
- // Filter out groups that are too small, too large, or have too
- // non-square aspect ratio
- PixelGroup::IdSet candidateGroups;
-
- // Maximum/minimum width assuming pattern is fully visible and >
- // 1/3 the image in width
- const int maxPatchWidth = outWidth / 6;
- const int minPatchWidth = outWidth / 3 / 7;
- const int maxPatchArea = maxPatchWidth * maxPatchWidth;
- const int minPatchArea = minPatchWidth * minPatchWidth;
- // Assuming nearly front-on view of target, so aspect ratio should
- // be quite close to square
- const float maxAspectRatio = 5.f / 4.f;
- const float minAspectRatio = 4.f / 5.f;
- for (int i = 0; i < (int)groups.size(); i++) {
- float aspect = groups[i].getApproxAspectRatio();
- if (aspect < minAspectRatio || aspect > maxAspectRatio) continue;
- // Check both boundary box area, and actual pixel count - they
- // should both be within bounds for a roughly square patch.
- int boundArea = groups[i].getBoundArea();
- if (boundArea < minPatchArea || boundArea > maxPatchArea) continue;
- int area = groups[i].getArea();
- if (area < minPatchArea || area > maxPatchArea) continue;
- candidateGroups.insert(&groups[i]);
- }
-
- // Find neighbors for candidate groups. O(n^2), but not many
- // candidates to go through
- for (PixelGroup::IdSetIter group = candidateGroups.begin();
- group != candidateGroups.end();
- group++) {
- (*group)->findNeighbors(candidateGroups);
- }
-
- // Try to find a plausible 6x4 grid by taking each pixel group as
- // the candidate top-left corner and try to build a grid from
- // it. Assumes no missing patches.
- float bestError = -1;
- std::vector<int> bestGrid(6 * 4,0);
- for (PixelGroup::IdSetIter group = candidateGroups.begin();
- group != candidateGroups.end();
- group++) {
- int dex, dey; (*group)->getApproxCenter(&dex, &dey);
- std::vector<int> grid(6 * 4, 0);
- PixelGroup *tl = *group;
- PixelGroup *bl, *tr, *br;
-
- // Find the bottom-left and top-right corners
- if ( (bl = tl->getDNeighbor(3)) == NULL ||
- (tr = tl->getRNeighbor(5)) == NULL ) continue;
- LOGV("Candidate at %d, %d", dex, dey);
- LOGV(" Got BL and TR");
-
- // Find the bottom-right corner
- if ( tr->getDNeighbor(3) == NULL ) {
- LOGV(" No BR from TR");
- continue;
- }
- br = tr->getDNeighbor(3);
- if ( br != bl->getRNeighbor(5) ) {
- LOGV(" BR from TR and from BL don't agree");
- continue;
- }
- br->getApproxCenter(&dex, &dey);
- LOGV(" Got BR corner at %d, %d", dex, dey);
-
- // Check that matching grid edge lengths are about the same
- float gridTopWidth = tl->distanceTo(tr);
- float gridBotWidth = bl->distanceTo(br);
-
- if (gridTopWidth / gridBotWidth < minAspectRatio ||
- gridTopWidth / gridBotWidth > maxAspectRatio) continue;
- LOGV(" Got reasonable widths: %f %f", gridTopWidth, gridBotWidth);
-
- float gridLeftWidth = tl->distanceTo(bl);
- float gridRightWidth = tr->distanceTo(br);
-
- if (gridLeftWidth / gridRightWidth < minAspectRatio ||
- gridLeftWidth / gridRightWidth > maxAspectRatio) continue;
- LOGV(" Got reasonable heights: %f %f", gridLeftWidth, gridRightWidth);
-
- // Calculate average grid spacing
- float gridAvgXGap = (gridTopWidth + gridBotWidth) / 2 / 5;
- float gridAvgYGap = (gridLeftWidth + gridRightWidth) / 2 / 3;
-
- // Calculate total error between average grid spacing and
- // actual spacing Uses difference in expected squared distance
- // and actual squared distance
- float error = 0;
- for (int x = 0; x < 6; x++) {
- for (int y = 0; y < 4; y++) {
- PixelGroup *node;
- node = tl->getRNeighbor(x)->getDNeighbor(y);
- if (node == NULL) {
- error += outWidth * outWidth;
- grid[y * 6 + x] = 0;
- } else {
- grid[y * 6 + x] = node->getId();
- if (node == tl) continue;
- float dist = tl->distanceSqTo(node);
- float expXDist = (gridAvgXGap * x);
- float expYDist = (gridAvgYGap * y);
- float expDist = expXDist * expXDist + expYDist * expYDist;
- error += fabs(dist - expDist);
- }
- }
- }
- if (bestError == -1 ||
- bestError > error) {
- bestGrid = grid;
- bestError = error;
- LOGV(" Best candidate, error %f", error);
- }
- }
-
- // Check if a grid wasn't found
- if (bestError == -1) {
- LOGV("No color checker found!");
- }
-
- // Make sure black square is in bottom-right corner
- if (bestError != -1) {
- unsigned char tlValues[3];
- unsigned char brValues[3];
- int tlId = bestGrid[0];
- int brId = bestGrid[23];
-
- groups[tlId - 1].getAvgValue(tlValues);
- groups[brId - 1].getAvgValue(brValues);
-
- int tlSum = tlValues[0] + tlValues[1] + tlValues[2];
- int brSum = brValues[0] + brValues[1] + brValues[2];
- if (brSum > tlSum) {
- // Grid is upside down, need to flip!
- LOGV("Flipping grid to put grayscale ramp at bottom");
- bestGrid = std::vector<int>(bestGrid.rbegin(), bestGrid.rend());
- }
- }
-
- // Output average patch colors if requested
- if (bestError != -1 && patchColors != NULL) {
- for (int n = 0; n < 6 * 4 * colorChannels; n++) patchColors[n] = -1.f;
-
- // Scan over original input image for grid regions, degamma, average
- for (int px = 0; px < 6; px++) {
- for (int py = 0; py < 4; py++) {
- int id = bestGrid[py * 6 + px];
- if (id == 0) continue;
-
- PixelGroup &patch = groups[id - 1];
- int startX, startY;
- int endX, endY;
- patch.getBoundingBox(&startX, &startY, &endX, &endY);
-
- float sum[colorChannels] = {0.f};
- int count = 0;
- for (int y = startY; y <= endY; y++) {
- for (int x = startX; x < endX; x++) {
- if (outField(y,x).id != id) continue;
- for (int iY = y * outScale;
- iY < (y + 1) * outScale;
- iY++) {
- const unsigned char *inP = image +
- (iY * rowSpan)
- + (x * outScale * totalChannels);
- for (int iX = 0; iX < outScale; iX++) {
- for (int c = 0; c < colorChannels; c++) {
- // Convert to float and normalize
- float v = inP[c] / 255.f;
- // Gamma correct to get back to
- // roughly linear data
- v = pow(v, gammaCorrection);
- // Sum it up
- sum[c] += v;
- }
- count++;
- inP += totalChannels;
- }
- }
- }
- }
- for (int c = 0 ; c < colorChannels; c++) {
- patchColors[ (py * 6 + px) * colorChannels + c ] =
- sum[c] / count;
- }
- }
- }
- // Print out patch colors
- IF_LOGV() {
- for (int y = 0; y < 4; y++) {
- char tmpMsg[256];
- int cnt = 0;
- cnt = snprintf(tmpMsg, 256, "%02d:", y + 1);
- for (int x = 0; x < 6; x++) {
- int id = bestGrid[y * 6 + x];
- if (id != 0) {
- float *p = &patchColors[ (y * 6 + x) * colorChannels];
- cnt += snprintf(tmpMsg + cnt, 256 - cnt,
- "\t(%.3f,%.3f,%.3f)", p[0], p[1], p[2]);
- } else {
- cnt += snprintf(tmpMsg + cnt, 256 - cnt,
- "\t(xxx,xxx,xxx)");
- }
- }
- LOGV("%s", tmpMsg);
- }
- }
- }
-
- // Draw output if requested
- if (outputImage != NULL) {
- *outputImage = output;
- *outputWidth = outWidth;
- *outputHeight = outHeight;
-
- // Draw all candidate group bounds
- for (PixelGroup::IdSetIter group = candidateGroups.begin();
- group != candidateGroups.end();
- group++) {
-
- int x,y;
- (*group)->getApproxCenter(&x, &y);
-
- // Draw candidate bounding box
- int x0, y0, x1, y1;
- (*group)->getBoundingBox(&x0, &y0, &x1, &y1);
- drawLine(output, outWidth,
- x0, y0, x1, y0,
- 255, 0, 0);
- drawLine(output, outWidth,
- x1, y0, x1, y1,
- 255, 0, 0);
- drawLine(output, outWidth,
- x1, y1, x0, y1,
- 255, 0, 0);
- drawLine(output, outWidth,
- x0, y1, x0, y0,
- 255, 0, 0);
-
- // Draw lines between neighbors
- // Red for to-right and to-below of me connections
- const PixelGroup *neighbor;
- if ( (neighbor = (*group)->getRNeighbor()) != NULL) {
- int nX, nY;
- neighbor->getApproxCenter(&nX, &nY);
- drawLine(output,
- outWidth,
- x, y, nX, nY,
- 255, -1, -1);
- }
- if ( (neighbor = (*group)->getDNeighbor()) != NULL) {
- int nX, nY;
- neighbor->getApproxCenter(&nX, &nY);
- drawLine(output,
- outWidth,
- x, y, nX, nY,
- 255, -1, -1);
- }
- // Blue for to-left or to-above of me connections
- if ( (neighbor = (*group)->getLNeighbor()) != NULL) {
- int nX, nY;
- neighbor->getApproxCenter(&nX, &nY);
- drawLine(output,
- outWidth,
- x, y, nX, nY,
- -1, -1, 255);
- }
- if ( (neighbor = (*group)->getUNeighbor()) != NULL) {
- int nX, nY;
- neighbor->getApproxCenter(&nX, &nY);
- drawLine(output,
- outWidth,
- x, y, nX, nY,
- -1, -1, 255);
- }
- }
-
- // Mark found grid patch pixels
- if (bestError != -1) {
- for (int x=0; x < 6; x++) {
- for (int y =0; y < 4; y++) {
- int id = bestGrid[y * 6 + x];
- if (id != 0) {
- int x0, y0, x1, y1;
- groups[id - 1].getBoundingBox(&x0, &y0, &x1, &y1);
- // Fill patch pixels with blue
- for (int px = x0; px < x1; px++) {
- for (int py = y0; py < y1; py++) {
- if (outField(py,px).id != id) continue;
- unsigned char *p =
- &output[(py * outWidth + px)
- * totalChannels];
- p[0] = 0;
- p[1] = 0;
- p[2] = 255;
-
- }
- }
- drawLine(output, outWidth,
- x0, y0, x1, y1,
- 0, 255, 0);
- drawLine(output, outWidth,
- x0, y1, x0, y1,
- 0, 255, 0);
- }
- }
- }
- }
-
- } else {
- delete output;
- }
-
- int64_t endTime = systemTime();
- LOGV("Process time: %f ms",
- (endTime - startTime) / 1000000.);
-
- if (bestError == -1) return false;
-
- return true;
-}
diff --git a/apps/CtsVerifier/lib/colorchecker/colorcheckertest.cpp b/apps/CtsVerifier/lib/colorchecker/colorcheckertest.cpp
new file mode 100644
index 0000000..46b8cc8
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/colorcheckertest.cpp
@@ -0,0 +1,979 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "ColorCheckerTest"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <cmath>
+#include <string>
+
+#include "vec2.h"
+#include "vec3.h"
+#include "colorcheckertest.h"
+
+const float GAMMA_CORRECTION = 2.2f;
+const float COLOR_ERROR_THRESHOLD = 200.f;
+ColorCheckerTest::~ColorCheckerTest() {
+ ALOGV("Deleting color checker test handler");
+
+ if (mImage != NULL) {
+ delete mImage;
+ }
+ ALOGV("Image deleted");
+
+ int numHorizontalLines = mCandidateColors.size();
+ int numVerticalLines = mCandidateColors[0].size();
+
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[i][j] != NULL) {
+ delete mCandidateColors[i][j];
+ }
+ if (mCandidatePositions[i][j] != NULL) {
+ delete mCandidatePositions[i][j];
+ }
+ }
+ }
+ ALOGV("Candidates deleted!");
+
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0; j < 6; ++j) {
+ if (mMatchPositions[i][j] != NULL) {
+ delete mMatchPositions[i][j];
+ }
+ if (mReferenceColors[i][j] != NULL) {
+ delete mReferenceColors[i][j];
+ }
+ if (mMatchColors[i][j] != NULL) {
+ delete mMatchColors[i][j];
+ }
+ }
+ }
+}
+
+// Adds a new image to the test handler.
+void ColorCheckerTest::addTestingImage(TestingImage* inputImage) {
+ if (mImage != NULL) {
+ delete mImage;
+ }
+ mImage = NULL;
+ ALOGV("Original image deleted");
+ mImage = inputImage;
+
+ if ((mImage->getHeight() == getDebugHeight()) &&
+ (mImage->getWidth() == getDebugWidth())) {
+ copyDebugImage(getDebugHeight(), getDebugWidth(), mImage->getImage());
+ }
+}
+
+void ColorCheckerTest::processData() {
+ mSuccess = false;
+ initializeRefColor();
+ edgeDetection();
+}
+
+void ColorCheckerTest::initializeRefColor() {
+ mReferenceColors.resize(4, std::vector<Vec3i*>(6, NULL));
+ mMatchPositions.resize(4, std::vector<Vec2f*>(6, NULL));
+ mMatchColors.resize(4, std::vector<Vec3f*>(6, NULL));
+ mMatchRadius.resize(4, std::vector<float>(6, 0.f));
+
+ mReferenceColors[0][0]= new Vec3i(115, 82, 68);
+ mReferenceColors[0][1]= new Vec3i(194, 150, 130);
+ mReferenceColors[0][2]= new Vec3i(98, 122, 157);
+ mReferenceColors[0][3]= new Vec3i(87, 108, 67);
+ mReferenceColors[0][4]= new Vec3i(133, 128, 177);
+ mReferenceColors[0][5]= new Vec3i(103, 189, 170);
+ mReferenceColors[1][0]= new Vec3i(214, 126, 44);
+ mReferenceColors[1][1]= new Vec3i(80, 91, 166);
+ mReferenceColors[1][2]= new Vec3i(193, 90, 99);
+ mReferenceColors[1][3]= new Vec3i(94, 60, 108);
+ mReferenceColors[1][4]= new Vec3i(157, 188, 64);
+ mReferenceColors[1][5]= new Vec3i(224, 163, 46);
+ mReferenceColors[2][0]= new Vec3i(56, 61, 150);
+ mReferenceColors[2][1]= new Vec3i(70, 148, 73);
+ mReferenceColors[2][2]= new Vec3i(175, 54, 60);
+ mReferenceColors[2][3]= new Vec3i(231, 199, 31);
+ mReferenceColors[2][4]= new Vec3i(187, 86, 149);
+ mReferenceColors[2][5]= new Vec3i(8, 133, 161);
+ mReferenceColors[3][0]= new Vec3i(243, 243, 242);
+ mReferenceColors[3][1]= new Vec3i(200, 200, 200);
+ mReferenceColors[3][2]= new Vec3i(160, 160, 160);
+ mReferenceColors[3][3]= new Vec3i(122, 122, 121);
+ mReferenceColors[3][4]= new Vec3i(85, 85, 85);
+ mReferenceColors[3][5]= new Vec3i(52, 52, 52);
+}
+
+void ColorCheckerTest::edgeDetection() {
+ int width = mImage->getWidth();
+ int height = mImage->getHeight();
+
+ bool* edgeMap = new bool[height * width];
+ unsigned char* grayImage = new unsigned char[height * width];
+
+ // If the image is a color image and can be converted to a luminance layer
+ if (mImage->rgbToGrayScale(grayImage)) {
+ float* gradientMap = new float[height * width * 2];
+
+ // Computes the gradient image on the luminance layer.
+ computeGradient(grayImage, gradientMap);
+
+ float* gradientMagnitude = new float[height * width];
+ int* gradientDirectionInt = new int[height * width];
+ float* gradientDirection = new float[height * width];
+
+ // Computes the absolute gradient of the image without padding.
+ for (int i = 1; i < height - 1; ++i) {
+ for (int j = 1; j < width - 1; ++j) {
+ gradientMagnitude[i * width + j] =
+ sqrt(gradientMap[(i * width + j) * 2] *
+ gradientMap[(i * width + j) * 2] +
+ gradientMap[(i * width + j ) * 2 + 1] *
+ gradientMap[(i * width + j ) * 2 + 1]);
+
+ // Computes the gradient direction of the image.
+ if (gradientMap[(i * width + j) * 2] == 0 ) {
+ // If the vertical gradient is 0, the edge is horizontal
+ // Mark the gradient direction as 90 degrees.
+ gradientDirectionInt[i * width + j] = 2;
+ gradientDirection[i * width + j] = 90.0f;
+ } else {
+ // Otherwise the atan operation is valid and can decide
+ // the gradient direction of the edge.
+ float gradient = atan(gradientMap[(i * width + j) * 2 + 1]
+ / gradientMap[(i * width + j) * 2])
+ / (M_PI / 4);
+
+ gradientDirection[i * width + j] = gradient * 45.0f;
+
+ // Maps the gradient direction to 4 major directions with
+ // 0 mapped to up and 2 mapped to right.
+ if (gradient - floor(gradient) > 0.5) {
+ gradientDirectionInt[i * width + j] =
+ (static_cast<int>(ceil(gradient)) + 4) % 4;
+ } else {
+ gradientDirectionInt[i * width + j] =
+ (static_cast<int>(floor(gradient)) + 4) % 4;
+ }
+ }
+ }
+ }
+
+ // Compute a boolean map to show whether a pixel is on the edge.
+ for (int i = 1; i < height - 1; ++i) {
+ for (int j = 1; j < width - 1; ++j) {
+ edgeMap[i * width + j] = false;
+
+ switch (gradientDirectionInt[i * width + j]) {
+ case 0:
+ // If the gradient points rightwards, the pixel is
+ // on an edge if it has a larger absolute gradient than
+ // pixels on its left and right sides.
+ if ((gradientMagnitude[i * width + j] >=
+ gradientMagnitude[i * width + j + 1]) &&
+ (gradientMagnitude[i * width + j] >=
+ gradientMagnitude[i * width + j - 1])) {
+ edgeMap[i * width + j] = true;
+ }
+ break;
+ case 1:
+ // If the gradient points right-downwards, the pixel is
+ // on an edge if it has a larger absolute gradient than
+ // pixels on its upper left and bottom right sides.
+ if ((gradientMagnitude[i * width + j] >=
+ gradientMagnitude[(i + 1) * width + j + 1]) &&
+ (gradientMagnitude[i * width + j] >=
+ gradientMagnitude[(i - 1) * width + j - 1])) {
+ edgeMap[i * width + j] = true;
+ }
+ break;
+ case 2:
+ // If the gradient points upwards, the pixel is
+ // on an edge if it has a larger absolute gradient than
+ // pixels on its up and down sides.
+ if ((gradientMagnitude[i * width + j] >=
+ gradientMagnitude[(i + 1) * width + j]) &&
+ (gradientMagnitude[i * width + j] >=
+ gradientMagnitude[(i - 1) * width + j])) {
+ edgeMap[i * width + j] = true;
+ }
+ break;
+ case 3:
+ // If the gradient points right-upwards, the pixel is
+ // on an edge if it has a larger absolute gradient than
+ // pixels on its bottom left and upper right sides.
+ if ((gradientMagnitude[i * width + j] >=
+ gradientMagnitude[(i - 1) * width + j + 1]) &&
+ (gradientMagnitude[i * width + j] >=
+ gradientMagnitude[(i + 1) * width + j - 1])) {
+ edgeMap[i * width + j] = true;
+ }
+ }
+
+ }
+ }
+
+ houghLineDetection(edgeMap, gradientMagnitude, gradientDirection);
+
+ // Cleans up
+ delete[] gradientMap;
+ delete[] gradientDirectionInt;
+ delete[] gradientMagnitude;
+ delete[] gradientDirection;
+
+ } else {
+ ALOGE("Not a color image!");
+ }
+
+ delete[] edgeMap;
+ delete[] grayImage;
+}
+
+// Runs the hough voting algorithm to find the grid of the color checker
+// with the edge map, gradient direction and gradient magnitude as inputs.
+void ColorCheckerTest::houghLineDetection(bool* edgeMap,
+ float* gradientMagnitude,
+ float* gradientDirection) {
+ // Constructs a graph for Hough voting. The vertical axis counts the vote
+ // for a certain angle. The horizontal axis counts the vote for the distance
+ // of a line from the origin of the image.
+ int houghHeight = 180;
+ int houghWidth = 200;
+ int houghCounts[houghHeight][houghWidth];
+ int houghSum[houghHeight][houghWidth];
+
+ int** houghVote;
+ houghVote = new int*[180];
+ for (int i = 0; i < 180; ++i) {
+ houghVote[i] = new int[200];
+ }
+
+ for (int i = 0; i < houghHeight; ++i) {
+ for (int j = 0; j < houghWidth; ++j) {
+ houghCounts[i][j] = 0;
+ houghVote[i][j] = 0;
+ houghSum[i][j] = 0;
+ }
+ }
+
+ // Vectors to record lines in two orthogonal directions.
+ // Each line is represented by its direction and its distance to the origin.
+ std::vector<std::vector<int> > verticalLines;
+ std::vector<std::vector<int> > horizontalLines;
+ float radius;
+ int height = mImage->getHeight();
+ int width = mImage->getWidth();
+
+ // Processes the signicant edge pixels and cast vote for the corresponding
+ // edge passing this pixel.
+ for (int i = 1; i < height - 1; ++i) {
+ for (int j = 1; j < width - 1; ++j) {
+ // Sets threashold for the gradient magnitude to discount noises
+ if (edgeMap[i * width + j] &&
+ (gradientMagnitude[i * width + j] > 15)) {
+ int shiftedAngle;
+
+ // Shifts angles for 45 degrees so the vertical and horizontal
+ // direction is mapped to 45 and 135 degrees to avoid padding.
+ // This uses the assumption that the color checker is placed
+ // roughly parallel to the image boarders. So that the edges
+ // at the angle of 45 will be rare.
+ shiftedAngle = (static_cast<int>(
+ -gradientDirection[i * width + j]) + 225 % 180);
+ float shiftedAngleRad = static_cast<float>(shiftedAngle)
+ * M_PI / 180.0f;
+
+ // Computes the distance of the line from the origin.
+ float a, b;
+ a = static_cast<float>(i - j) / sqrt(2.0f);
+ b = static_cast<float>(i + j) / sqrt(2.0f);
+ radius = a * sin(shiftedAngleRad) - b * cos(shiftedAngleRad);
+
+ // Adds one vote for the line. The line's angle is shifted by
+ // 45 degrees to avoid avoid padding for the vertical lines,
+ // which is more common than diagonal lines. The line's
+ // distance is mapped to [0, 200] from [-200, 200].
+ ++houghCounts[shiftedAngle][static_cast<int>((radius / 2.0f) +
+ 100.0f)];
+
+ drawPoint(i, j, Vec3i(255, 255, 255));
+ }
+ }
+ }
+
+ int houghAngleSum[houghHeight];
+ int primaryVerticalAngle, primaryHorizontalAngle;
+ int max1 = 0;
+ int max2 = 0;
+
+ // Looking for the two primary angles of the lines.
+ for (int i = 5; i < houghHeight - 5; ++i) {
+ houghAngleSum[i] = 0;
+ for (int j = 0; j < houghWidth; ++j) {
+ for (int l = -5; l <= 5; ++l) {
+ houghSum[i][j] += houghCounts[i + l][j];
+ }
+ houghAngleSum[i] += houghSum[i][j];
+ }
+
+ if ((i < houghHeight / 2) && (houghAngleSum[i] > max1)) {
+ max1 = houghAngleSum[i];
+ primaryVerticalAngle = i;
+ } else if ((i > houghHeight / 2) && (houghAngleSum[i] > max2)) {
+ max2 = houghAngleSum[i];
+ primaryHorizontalAngle = i;
+ }
+ }
+
+ ALOGV("Primary angles are %d, %d",
+ primaryVerticalAngle, primaryHorizontalAngle);
+
+ int angle;
+
+ // For each primary angle, look for the highest voted lines.
+ for (int k = 0; k < 2; ++k) {
+ if (k == 0) {
+ angle = primaryVerticalAngle;
+ } else {
+ angle = primaryHorizontalAngle;
+ }
+
+ std::vector<int> line(2);
+ for (int j = 2; j < houghWidth - 2; ++j) {
+ houghVote[angle][j] = houghSum[angle][j];
+ houghSum[angle][j] = 0;
+ }
+
+ // For each radius, average the vote with nearby ones.
+ for (int j = 2; j < houghWidth - 2; ++j) {
+ for (int m = -2; m <= 2; ++m) {
+ houghSum[angle][j] += houghVote[angle][j + m];
+ }
+ }
+
+ bool isCandidate[houghWidth];
+
+ // Find whether a lines is a candidate by rejecting the ones that have
+ // lower vote than others in the neighborhood.
+ for (int j = 2; j < houghWidth - 2; ++j) {
+ isCandidate[j] = true;
+ for (int m = -2; ((isCandidate[j]) && (m <= 2)); ++m) {
+ if ((houghSum[angle][j] < 20) ||
+ (houghSum[angle][j] < houghSum[angle][j + m])) {
+ isCandidate[j] = false;
+ }
+ }
+ }
+
+ int iter1 = 0;
+ int iter2 = 0;
+ int count = 0;
+
+ // Finds the lines that are not too close to each other and add to the
+ // detected lines.
+ while (iter2 < houghWidth) {
+ while ((!isCandidate[iter2]) && (iter2 < houghWidth)) {
+ ++iter2;
+ }
+ if ((isCandidate[iter2]) && (iter2 - iter1 < 5)) {
+ iter1 = (iter2 + iter1) / 2;
+ ++iter2;
+ } else {
+ line[0] = angle;
+ line[1] = (iter1 - 100) * 2;
+ if (iter1 != 0) {
+ if (k == 0) {
+ verticalLines.push_back(line);
+ Vec3i color(verticalLines.size() * 20, 0, 0);
+ drawLine(line[0], line[1], color);
+ } else {
+ horizontalLines.push_back(line);
+ Vec3i color(0, horizontalLines.size() * 20, 0);
+ drawLine(line[0], line[1], color);
+ }
+ }
+ iter1 = iter2;
+ ++iter2;
+ ALOGV("pushing back line %d %d", line[0], line[1]);
+ }
+ }
+ }
+
+ ALOGV("Numbers of lines in each direction is %d, %d",
+ verticalLines.size(), horizontalLines.size());
+
+ for (int i = 0; i < 180; ++i) {
+ delete[] houghVote[i];
+ }
+ delete[] houghVote;
+
+ findCheckerBoards(verticalLines, horizontalLines);
+}
+
+// Computes the gradient in both x and y direction of a layer
+void ColorCheckerTest::computeGradient(unsigned char* layer,
+ float* gradientMap) {
+ int width = mImage->getWidth();
+ int height = mImage->getHeight();
+
+ // Computes the gradient in the whole image except the image boarders.
+ for (int i = 1; i < height - 1; ++i) {
+ for (int j = 1; j < width - 1; ++j) {
+ gradientMap[(i * width + j) * 2] =
+ 0.5f * (layer[i * width + j + 1] -
+ layer[i * width + j - 1]);
+ gradientMap[(i * width + j) * 2 + 1] =
+ 0.5f * (layer[(i + 1) * width + j] -
+ layer[(i - 1) * width + j]);
+ }
+ }
+}
+
+// Tries to find the checker boards with the highest voted lines
+void ColorCheckerTest::findCheckerBoards(
+ std::vector<std::vector<int> > verticalLines,
+ std::vector<std::vector<int> > horizontalLines) {
+ ALOGV("Start looking for Color checker");
+
+ int numHorizontalLines = mCandidateColors.size();
+ int numVerticalLines;
+ if (numHorizontalLines > 0) {
+ numVerticalLines = mCandidateColors[0].size();
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[i][j] != NULL) {
+ delete mCandidateColors[i][j];
+ }
+ if (mCandidatePositions[i][j] != NULL) {
+ delete mCandidatePositions[i][j];
+ }
+ }
+ mCandidateColors[i].clear();
+ mCandidatePositions[i].clear();
+ }
+ }
+ mCandidateColors.clear();
+ mCandidatePositions.clear();
+
+ ALOGV("Candidates deleted!");
+
+ numVerticalLines = verticalLines.size();
+ numHorizontalLines = horizontalLines.size();
+ Vec2f pointUpperLeft;
+ Vec2f pointBottomRight;
+
+ mCandidateColors.resize(numHorizontalLines - 1);
+ mCandidatePositions.resize(numHorizontalLines - 1);
+
+ for (int i = numVerticalLines - 1; i >= 1; --i) {
+ for (int j = 0; j < numHorizontalLines - 1; ++j) {
+ // Finds the upper left and bottom right corner of each rectangle
+ // formed by two neighboring highest voted lines.
+ pointUpperLeft = findCrossing(verticalLines[i], horizontalLines[j]);
+ pointBottomRight = findCrossing(verticalLines[i - 1],
+ horizontalLines[j + 1]);
+
+ Vec3i* color = new Vec3i();
+ Vec2f* pointCenter = new Vec2f();
+ // Verifies if they are separated by a reasonable distance.
+ if (verifyPointPair(pointUpperLeft, pointBottomRight,
+ pointCenter, color)) {
+ mCandidatePositions[j].push_back(pointCenter);
+ mCandidateColors[j].push_back(color);
+ ALOGV("Color at (%d, %d) is (%d, %d, %d)", j, i,color->r(), color->g(), color->b());
+
+ } else {
+ mCandidatePositions[j].push_back(NULL);
+ mCandidateColors[j].push_back(NULL);
+ delete color;
+ delete pointCenter;
+ }
+ }
+ }
+
+ ALOGV("Candidates Number (%d, %d)", mCandidateColors.size(), mCandidateColors[0].size());
+ // Verifies whether the current line candidates form a valid color checker.
+ verifyColorGrid();
+}
+
+// Returns the corssing point of two lines given the lines.
+Vec2f ColorCheckerTest::findCrossing(std::vector<int> line1,
+ std::vector<int> line2) {
+ Vec2f crossingPoint;
+ float r1 = static_cast<float>(line1[1]);
+ float r2 = static_cast<float>(line2[1]);
+ float ang1, ang2;
+ float y1, y2;
+
+ ang1 = static_cast<float>(line1[0]) / 180.0f * M_PI;
+ ang2 = static_cast<float>(line2[0]) / 180.0f * M_PI;
+
+ float x, y;
+ x = (r1 * cos(ang2) - r2 * cos(ang1)) / sin(ang1 - ang2);
+ y = (r1 * sin(ang2) - r2 * sin(ang1)) / sin(ang1 - ang2);
+
+ crossingPoint.set((x + y) / sqrt(2.0), (y - x) / sqrt(2.0));
+
+ //ALOGV("Crosspoint at (%f, %f)", crossingPoint.x(), crossingPoint.y());
+ return crossingPoint;
+}
+
+// Verifies whether two opposite corners on a quadrilateral actually can be
+// the two corners of a color checker.
+bool ColorCheckerTest::verifyPointPair(Vec2f pointUpperLeft,
+ Vec2f pointBottomRight,
+ Vec2f* pointCenter,
+ Vec3i* color) {
+ bool success = true;
+
+ /** 5 and 30 are the threshold tuned for resolution 640*480*/
+ if ((pointUpperLeft.x() < 0) ||
+ (pointUpperLeft.x() >= mImage->getHeight()) ||
+ (pointUpperLeft.y() < 0) ||
+ (pointUpperLeft.y() >= mImage->getWidth()) ||
+ (pointBottomRight.x() < 0) ||
+ (pointBottomRight.x() >= mImage->getHeight()) ||
+ (pointBottomRight.y() < 0) ||
+ (pointBottomRight.y() >= mImage->getWidth()) ||
+ (abs(pointUpperLeft.x() - pointBottomRight.x()) <= 5) ||
+ (abs(pointUpperLeft.y() - pointBottomRight.y()) <= 5) ||
+ (abs(pointUpperLeft.x() - pointBottomRight.x()) >= 30) ||
+ (abs(pointUpperLeft.y() - pointBottomRight.y()) >= 30)) {
+
+ // If any of the quadrilateral corners are out of the image or if
+ // the distance between them are too large or too big, the quadrilateral
+ // could not be one of the checkers
+ success = false;
+ } else {
+ // Find the checker center if the corners of the rectangle meet criteria
+ pointCenter->set((pointUpperLeft.x() + pointBottomRight.x()) / 2.0f,
+ (pointUpperLeft.y() + pointBottomRight.y()) / 2.0f);
+ color->set(mImage->getPixelValue(*pointCenter).r(),
+ mImage->getPixelValue(*pointCenter).g(),
+ mImage->getPixelValue(*pointCenter).b());
+ ALOGV("Color at (%f, %f) is (%d, %d, %d)", pointCenter->x(), pointCenter->y(),color->r(), color->g(), color->b());
+ }
+ return success;
+}
+
+// Verifies the color checker centers and finds the match between the detected
+// color checker and the reference MacBeth color checker
+void ColorCheckerTest::verifyColorGrid() {
+ ALOGV("Start looking for Color Grid");
+ int numHorizontalLines = mCandidateColors.size();
+ int numVerticalLines = mCandidateColors[0].size();
+ bool success = false;
+
+ // Computes the standard deviation of one row/column of the proposed color
+ // checker. Discards the row/column if the std is below a threshold.
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ Vec3f meanColor(0.f, 0.f, 0.f);
+ int numNonZero = 0;
+
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[i][j] != NULL) {
+ ALOGV("candidate color (%d, %d) is (%d, %d, %d)", i, j, mCandidateColors[i][j]->r(), mCandidateColors[i][j]->g(), mCandidateColors[i][j]->b());
+
+ meanColor = meanColor + (*mCandidateColors[i][j]);
+ ++numNonZero;
+ }
+ }
+ if (numNonZero > 0) {
+ meanColor = meanColor / numNonZero;
+ }
+ ALOGV("Mean color for vertical direction computed!");
+
+ float std = 0;
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[i][j] != NULL) {
+ std += mCandidateColors[i][j]->squareDistance<float>(meanColor);
+ }
+ }
+ if (numNonZero > 0) {
+ std = sqrt(std / (3 * numNonZero));
+ }
+ ALOGV("st. deviation for the %d dir1 is %d", i, static_cast<int>(std));
+
+ if ((std <= 30) && (numNonZero > 1)) {
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[i][j] != NULL) {
+ delete mCandidateColors[i][j];
+ mCandidateColors[i][j] = NULL;
+ }
+ }
+ }
+ }
+
+ // Discards the column/row of the color checker if the std is below a
+ // threshold.
+ for (int j = 0; j < numVerticalLines; ++j) {
+ Vec3f meanColor(0.f, 0.f, 0.f);
+ int numNonZero = 0;
+
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ if (mCandidateColors[i][j] != NULL) {
+ meanColor = meanColor + (*mCandidateColors[i][j]);
+ ++numNonZero;
+ }
+ }
+ if (numNonZero > 0) {
+ meanColor = meanColor / numNonZero;
+ }
+
+ float std = 0;
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ if (mCandidateColors[i][j] != NULL) {
+ std += mCandidateColors[i][j]->squareDistance<float>(meanColor);
+ }
+ }
+ if (numNonZero > 0) {
+ std = sqrt(std / (3 * numNonZero));
+ }
+
+ ALOGV("st. deviation for the %d dir2 is %d", j, static_cast<int>(std));
+
+ if ((std <= 30) && (numNonZero > 1)) {
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ if (mCandidateColors[i][j] != NULL) {
+ delete mCandidateColors[i][j];
+ mCandidateColors[i][j] = NULL;
+ }
+ }
+ }
+ }
+
+ for (int i = 0; i < numHorizontalLines; ++i) {
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[i][j] != NULL) {
+ ALOGV("position (%d, %d) is at (%f, %f) with color (%d, %d, %d)",
+ i, j,
+ mCandidatePositions[i][j]->x(),
+ mCandidatePositions[i][j]->y(),
+ mCandidateColors[i][j]->r(),
+ mCandidateColors[i][j]->g(),
+ mCandidateColors[i][j]->b());
+ } else {
+ ALOGV("position (%d, %d) is 0", i, j);
+ }
+ }
+ }
+
+ // Finds the match between the detected color checker and the reference
+ // MacBeth color checker.
+ int rowStart = 0;
+ int rowEnd = 0;
+
+ // Loops until all dectected color checker has been processed.
+ while (!success) {
+ int columnStart = 0;
+ int columnEnd = 0;
+ bool isRowStart = false;
+ bool isRowEnd = true;
+
+ // Finds the row start of the next block of detected color checkers.
+ while ((!isRowStart) && (rowStart < numHorizontalLines)) {
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[rowStart][j] != NULL) {
+ isRowStart = true;
+ }
+ }
+ ++rowStart;
+ }
+ rowStart--;
+ rowEnd = rowStart;
+ ALOGV("rowStart is %d", rowStart);
+
+ // Finds the row end of the next block of detected color checkers.
+ while ((isRowEnd) && (rowEnd < numHorizontalLines)) {
+ isRowEnd = false;
+ for (int j = 0; j < numVerticalLines; ++j) {
+ if (mCandidateColors[rowEnd][j] != NULL) {
+ isRowEnd= true;
+ }
+ }
+ if (isRowEnd) {
+ ++rowEnd;
+ }
+ }
+ if ((!isRowEnd) && isRowStart) {
+ rowEnd--;
+ }
+ if ((isRowEnd) && (rowEnd == numHorizontalLines)) {
+ rowEnd--;
+ isRowEnd = false;
+ }
+ ALOGV("rowEnd is %d", rowEnd);
+
+ // Matches color checkers between the start row and the end row.
+ bool successVertical = false;
+
+ while (!successVertical) {
+ bool isColumnEnd = true;
+ bool isColumnStart = false;
+
+ // Finds the start column of the next block of color checker
+ while ((!isColumnStart) && (columnStart < numVerticalLines)) {
+ if (mCandidateColors[rowStart][columnStart] != NULL) {
+ isColumnStart = true;
+ }
+ ++columnStart;
+ }
+ columnStart--;
+ columnEnd = columnStart;
+
+ // Finds the end column of the next block of color checker
+ while ((isColumnEnd) && (columnEnd < numVerticalLines)) {
+ isColumnEnd = false;
+ if (mCandidateColors[rowStart][columnEnd] != NULL)
+ isColumnEnd = true;
+ if (isColumnEnd) {
+ ++columnEnd;
+ }
+ }
+
+ if ((!isColumnEnd) && isColumnStart) {
+ columnEnd--;
+ }
+ if ((isColumnEnd) && (columnEnd == numVerticalLines)) {
+ columnEnd--;
+ isColumnEnd = false;
+ }
+
+ // Finds the best match on the MacBeth reference color checker for
+ // the continuous block of detected color checker
+ if (isRowStart && (!isRowEnd) &&
+ isColumnStart && (!isColumnEnd)) {
+ findBestMatch(rowStart, rowEnd, columnStart, columnEnd);
+ }
+ ALOGV("FindBestMatch for %d, %d, %d, %d", rowStart,
+ rowEnd, columnStart, columnEnd);
+
+ // If the column search finishes, go out of the loop
+ if (columnEnd >= numVerticalLines - 1) {
+ successVertical = true;
+ } else {
+ columnStart = columnEnd + 1;
+ }
+ }
+ ALOGV("Continuing to search for direction 1");
+
+ // If the row search finishes, go out of the loop
+ if (rowEnd >= numHorizontalLines - 1) {
+ success = true;
+ } else {
+ rowStart = rowEnd + 1;
+ }
+ }
+
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0; j < 6; ++j) {
+ if (mMatchPositions[i][j] != NULL) {
+ ALOGV("Reference Match position for (%d, %d) is (%f, %f)", i, j,
+ mMatchPositions[i][j]->x(), mMatchPositions[i][j]->y());
+ }
+ }
+ }
+
+ fillRefColorGrid();
+}
+
+// Finds the best match on the MacBeth color checker for the continuous block of
+// detected color checkers bounded by row i1, row i2 and column j1 and column j2
+// Assumes that the subsample is less than 4*6.
+void ColorCheckerTest::findBestMatch(int i1, int i2, int j1, int j2) {
+ int numHorizontalGrid = i2 - i1 + 1;
+ int numVerticalGrid = j2 - j1 + 1;
+
+ if (((numHorizontalGrid > 1) || (numVerticalGrid > 1)) &&
+ (numHorizontalGrid <= 4) && (numVerticalGrid <= 6)) {
+ ALOGV("i1, j2, j1, j2 is %d, %d, %d, %d", i1, i2, j1, j2);
+ float minError;
+ float error = 0.f;
+ int horizontalMatch, verticalMatch;
+
+ // Finds the match start point where the error is minimized.
+ for (int i = 0; i < numHorizontalGrid; ++i) {
+ for (int j = 0; j < numVerticalGrid; ++j) {
+ if (mCandidateColors[i1 + i][j1 + j] != NULL) {
+ error += mCandidateColors[i1 + i][j1 + j]->squareDistance<int>(
+ *mReferenceColors[i][j]);
+ }
+ }
+ }
+ ALOGV("Error is %f", error);
+ minError = error;
+ horizontalMatch = 0;
+ verticalMatch = 0;
+
+ for (int i = 0; i <= 4 - numHorizontalGrid; ++i) {
+ for (int j = 0; j <= 6 - numVerticalGrid; ++j) {
+ error = 0.f;
+
+ for (int id = 0; id < numHorizontalGrid; ++id) {
+ for (int jd = 0; jd < numVerticalGrid; ++jd) {
+ if (mCandidateColors[i1 + id][j1 + jd] != NULL) {
+ error += mCandidateColors[i1 + id][j1 + jd]->
+ squareDistance<int>(
+ *mReferenceColors[i + id][j + jd]);
+ }
+ }
+ }
+
+ if (error < minError) {
+ minError = error;
+ horizontalMatch = i;
+ verticalMatch = j;
+ }
+ ALOGV("Processed %d, %d and error is %f", i, j, error );
+ }
+ }
+
+ for (int id = 0; id < numHorizontalGrid; ++id) {
+ for (int jd = 0; jd < numVerticalGrid; ++jd) {
+ if (mCandidatePositions[i1 + id][j1 + jd] != NULL) {
+ mMatchPositions[horizontalMatch + id][verticalMatch + jd] =
+ new Vec2f(mCandidatePositions[i1 + id][j1 + jd]->x(),
+ mCandidatePositions[i1 + id][j1 + jd]->y());
+ }
+ }
+ }
+ ALOGV("Grid match starts at %d, %d", horizontalMatch, verticalMatch);
+ }
+}
+
+// Finds the boundary of a color checker by its color similarity to the center.
+// Also predicts the location of unmatched checkers.
+void ColorCheckerTest::fillRefColorGrid() {
+ int rowStart = 0;
+ int columnStart = 0;
+ bool foundStart = true;
+
+ for (int i = 0; (i < 4) && foundStart; ++i) {
+ for (int j = 0; (j < 6) && foundStart; ++j) {
+ if (mMatchPositions[i][j] != NULL) {
+ rowStart = i;
+ columnStart = j;
+ foundStart = false;
+ }
+ }
+ }
+ ALOGV("First match found at (%d, %d)", rowStart, columnStart);
+
+ float rowDistance, columnDistance;
+ rowDistance = 0;
+ columnDistance = 0;
+ int numRowGrids = 0;
+ int numColumnGrids = 0;
+
+ for (int i = rowStart; i < 4; ++i) {
+ for (int j = columnStart; j < 6; ++j) {
+ if (mMatchPositions[i][j] != NULL) {
+ if (i > rowStart) {
+ ++numRowGrids;
+ rowDistance += (mMatchPositions[i][j]->x() -
+ mMatchPositions[rowStart][columnStart]->x()) /
+ static_cast<float>(i - rowStart);
+ }
+ if (j > columnStart) {
+ ++numColumnGrids;
+ columnDistance += (mMatchPositions[i][j]->y() -
+ mMatchPositions[rowStart][columnStart]->y()) /
+ static_cast<float>(j - columnStart);
+ }
+ }
+ }
+ }
+
+ if ((numRowGrids > 0) && (numColumnGrids > 0)) {
+ rowDistance = rowDistance / numRowGrids;
+ columnDistance = columnDistance / numColumnGrids;
+ ALOGV("delta is %f, %f", rowDistance, columnDistance);
+
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0 ; j < 6; ++j) {
+ if (mMatchPositions[i][j] == NULL) {
+ mMatchPositions[i][j] = new Vec2f(
+ mMatchPositions[rowStart][columnStart]->x() +
+ (i - rowStart) * rowDistance,
+ mMatchPositions[rowStart][columnStart]->y() +
+ (j - columnStart) * columnDistance);
+ }
+ }
+ }
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0; j < 6; ++j) {
+ float radius = 0;
+ Vec3i color = mImage->getPixelValue(*mMatchPositions[i][j]);
+ Vec3f meanColor(0.f , 0.f, 0.f);
+
+ int numPixels = 0;
+ for (int ii = static_cast<int>(mMatchPositions[i][j]->x() -
+ rowDistance/2);
+ ii <= static_cast<int>(mMatchPositions[i][j]->x() +
+ rowDistance/2);
+ ++ii) {
+ for (int jj = static_cast<int>(mMatchPositions[i][j]->y() -
+ columnDistance/2);
+ jj <= static_cast<int>(mMatchPositions[i][j]->y() +
+ columnDistance/2);
+ ++jj) {
+ if ((ii >= 0) && (ii < mImage->getHeight()) &&
+ (jj >= 0) && (jj < mImage->getWidth())) {
+ Vec3i pixelColor = mImage->getPixelValue(ii,jj);
+ float error = color.squareDistance<int>(pixelColor);
+
+ if (error < COLOR_ERROR_THRESHOLD) {
+ drawPoint(ii, jj, *mReferenceColors[i][j]);
+ meanColor = meanColor + pixelColor;
+ numPixels++;
+ Vec2i pixelPosition(ii, jj);
+
+ if (pixelPosition.squareDistance<float>(
+ *mMatchPositions[i][j]) > radius) {
+ radius = pixelPosition.squareDistance<float>(
+ *mMatchPositions[i][j]);
+ }
+ }
+ }
+ }
+ }
+
+ /** Computes the radius of the checker.
+ * The above computed radius is the squared distance to the
+ * furthest point with a matching color. To be conservative, we
+ * only consider an area with radius half of the above computed
+ * value. Since radius is computed as a squared root, the one
+ * that will be recorded is 1/4 of the above computed value.
+ */
+ mMatchRadius[i][j] = radius / 4.f;
+ mMatchColors[i][j] = new Vec3f(meanColor / numPixels);
+
+ ALOGV("Reference color at (%d, %d) is (%d, %d, %d)", i, j,
+ mReferenceColors[i][j]->r(),
+ mReferenceColors[i][j]->g(),
+ mReferenceColors[i][j]->b());
+ ALOGV("Average color at (%d, %d) is (%f, %f, %f)", i, j,
+ mMatchColors[i][j]->r(),
+ mMatchColors[i][j]->g(),
+ mMatchColors[i][j]->b());
+ ALOGV("Radius is %f", mMatchRadius[i][j]);
+ }
+ }
+
+ mSuccess = true;
+ }
+}
diff --git a/apps/CtsVerifier/lib/colorchecker/exposurecompensationtest.cpp b/apps/CtsVerifier/lib/colorchecker/exposurecompensationtest.cpp
new file mode 100644
index 0000000..da9fc40
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/exposurecompensationtest.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "ExposureCompensationTest"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <cmath>
+#include <string>
+#include <stdio.h>
+
+#include "vec2.h"
+#include "vec3.h"
+#include "exposurecompensationtest.h"
+
+const float GAMMA_CORRECTION = 2.2f;
+void ExposureCompensationTest::processData() {
+ ALOGV("Start Processing Exposure Compensation Test Data!");
+ clearDebugImage();
+
+ if (mDebugText != NULL) {
+ delete mDebugText;
+ mDebugText = NULL;
+ }
+
+ int numTests = mExposureValues.size();
+ int numPatches = mCheckerColors[0].size();
+ ALOGV("Processing %d tests with %d patches", numTests, numPatches);
+
+ mDebugText = new char[320 * numTests];
+ mDebugText[0] = 0;
+ char* debugText = new char[50];
+
+ Vec3i red(255, 0, 0);
+ Vec3i green(0, 255, 0);
+ Vec3i blue(0, 0, 255);
+
+ float minExposure = -3.0f;
+ float scale = 9.0f;
+ for (int i = 0; i < numTests; ++i) {
+ snprintf(debugText, 50, "Exposure is %f \n", mExposureValues[i]);
+ strcat(mDebugText, debugText);
+ for (int j = 0; j < numPatches; ++j) {
+ int exposureRed = static_cast<int>((
+ log(static_cast<float>(mReferenceColors[j].r()))
+ / log(2.0f) * GAMMA_CORRECTION +
+ mExposureValues[i] - minExposure) * scale);
+ int exposureGreen = static_cast<int>((
+ log(static_cast<float>(mReferenceColors[j].g()))
+ / log(2.0f) * GAMMA_CORRECTION +
+ mExposureValues[i] - minExposure) * scale);
+ int exposureBlue = static_cast<int>((
+ log(static_cast<float>(mReferenceColors[j].b()))
+ / log(2.0f) * GAMMA_CORRECTION +
+ mExposureValues[i] - minExposure) * scale);
+
+ snprintf(debugText, 50, "%d %f %d %f %d %f \n",
+ exposureRed, mCheckerColors[i][j].r(),
+ exposureGreen, mCheckerColors[i][j].g(),
+ exposureBlue, mCheckerColors[i][j].b());
+
+ ALOGV("%s", debugText);
+ strcat(mDebugText, debugText);
+
+ drawPoint(200 - exposureRed, mCheckerColors[i][j].r(), red);
+ drawPoint(200 - exposureGreen, mCheckerColors[i][j].g(), green);
+ drawPoint(200 - exposureBlue, mCheckerColors[i][j].b(), blue);
+ }
+ }
+ mExposureValues.clear();
+ mCheckerColors.clear();
+}
+
+void ExposureCompensationTest::initializeReferenceColors() {
+ mReferenceColors.resize(6);
+
+ mReferenceColors[0].set(243, 243, 242);
+ mReferenceColors[1].set(200, 200, 200);
+ mReferenceColors[2].set(160, 160, 160);
+ mReferenceColors[3].set(122, 122, 121);
+ mReferenceColors[4].set(85, 85, 85);
+ mReferenceColors[5].set(52, 52, 52);
+}
diff --git a/apps/CtsVerifier/lib/colorchecker/grouping.h b/apps/CtsVerifier/lib/colorchecker/grouping.h
deleted file mode 100755
index 3125f55..0000000
--- a/apps/CtsVerifier/lib/colorchecker/grouping.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vector>
-#include <utility>
-
-#ifndef FILTERPACK_CALIBRATION_GROUPING_H
-#define FILTERPACK_CALIBRATION_GROUPING_H
-
-// To use the Grouping function, derive one class from Field.
-// Field class provides the interface for the Grouping function.
-// FF_ID is the pixel class used to compare values,
-// != operator must be defined in this class
-// region number of the pixel
-
-typedef std::vector <std::vector<int> > MASK;
-typedef std::pair<int, int> POS;
-// FF_ID needs to implement the operator !=
-// bool operator != (const FF_ID &id)
-template <class FF_ID>
-class Field {
- public:
- int id_no;
- MASK mask;
- virtual FF_ID operator () (int y, int x) const =0 ;
- virtual int getWidth() const = 0;
- virtual int getHeight() const= 0;
- virtual ~Field() {}
-};
-
-template < class FF_ID>
-void FloodFill(int sx,
- int sy,
- int id_no,
- const FF_ID &id,
- Field<FF_ID> *pField,
- POS *new_pos) {
- std::vector<POS> stack;
- stack.push_back(POS(sx,sy));
- while (stack.size() > 0) {
- sx = stack.back().first;
- sy = stack.back().second;
- stack.pop_back();
-
- // fill the current line
- int x;
- for (x = sx-1; x >= 0; x--)
- {
- if (pField->mask[sy][x]!=0) break;
- if (id != (*pField)(sy,x)) {
- new_pos->first = x;
- new_pos->second =sy;
- break;
- }
- pField->mask[sy][x] = id_no;
- }
- int startx = x;
- for (x = sx;x < pField->getWidth(); x++) {
- if (pField->mask[sy][x]!=0) break;
- if (id != (*pField)(sy,x)) {
- new_pos->first = x;
- new_pos->second =sy;
- break;
- }
- pField->mask[sy][x] = id_no;
- }
- int endx = x;
- if (endx >= pField->getWidth()) endx = pField->getWidth() - 1;
- if (startx < 0) startx = 0;
- // push the adjacent spans to the stack
- if (sy>0) {
- int bNew = true;
- for (x = endx; x >= startx; x--) {
- if (pField->mask[sy-1][x] != 0 || id != (*pField)(sy-1,x) ) {
- bNew = true;
- continue;
- }
- if (bNew) {
- stack.push_back( POS(x, sy-1));
- bNew = false;
- }
- }
- }
- if (sy < (pField->getHeight() - 1)) {
- int bNew = true;
- for (x = endx; x >= startx; x--) {
- if (pField->mask[sy+1][x]!=0 || id != (*pField)(sy+1,x)) {
- bNew = true;
- continue;
- }
- if (bNew) {
- stack.push_back( POS(x, sy+1));
- bNew = false;
- }
- }
- }
- }
-}
-
-// Group the pixels in Field based on the FF_ID != operator.
-// All pixels will be labeled from 1. The total number of unique groups(regions)
-// is (pField->id_no - 1) after the call
-// The labeasl of the pixels are stored in the mask member of Field.
-
-template <class FF_ID>
-void Grouping(Field <FF_ID> *pField) {
- int width = pField->getWidth();
- int height = pField->getHeight();
- pField->mask = MASK(height, std::vector<int> (width, 0) );
-
- FF_ID id;
- pField->id_no = 1;
- int sx = width / 2, sy = height / 2;
- POS new_pos(-1,-1);
- while (1) {
- id = (*pField)(sy,sx);
- int id_no = pField->id_no;
- new_pos.first = -1;
- new_pos.second = -1;
- FloodFill(sx, sy, id_no, id, pField, &new_pos);
- if (new_pos.first < 0) // no new position found, during the flood fill
- {
- const int kNumOfRetries = 10;
- // try 10 times for the new unfilled position
- for (int i = 0; i < kNumOfRetries; i++) {
- sx = rand() % width;
- sy = rand() % height;
- if (pField->mask[sy][sx] == 0) {
- new_pos.first = sx;
- new_pos.second = sy;
- break;
- }
- }
- if (new_pos.first < 0) { // still failed, search the whole image
- for (int y = 0; y < height && new_pos.first < 0; y++)
- for (int x = 0; x < width; x++) {
- if (pField->mask[y][x] == 0) {
- new_pos.first = x;
- new_pos.second = y;
- break;
- }
- }
- }
- if (new_pos.first < 0) break; // finished
- }
- sx = new_pos.first;
- sy = new_pos.second;
- pField->id_no++;
- }
-}
-
-#endif
diff --git a/apps/CtsVerifier/lib/colorchecker/imagetesthandler.cpp b/apps/CtsVerifier/lib/colorchecker/imagetesthandler.cpp
new file mode 100644
index 0000000..1c5bc17
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/imagetesthandler.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "ImageTestHandler"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <cmath>
+
+#include "vec2.h"
+#include "vec3.h"
+#include "imagetesthandler.h"
+
+void ImageTestHandler::initDebugImage() {
+ mDebugOutput = NULL;
+}
+
+// Initializes the debug image with a given height and width.
+void ImageTestHandler::initDebugImage(int debugHeight,
+ int debugWidth) {
+ mDebugOutput = NULL;
+ mDebugOutput = new unsigned char[debugHeight * debugWidth * 4];
+ memset(mDebugOutput, 0, debugHeight * debugWidth * 4);
+
+ mDebugHeight = debugHeight;
+ mDebugWidth = debugWidth;
+}
+
+// Copies an existing image to the debug image.
+void ImageTestHandler::copyDebugImage(int inputHeight, int inputWidth,
+ const unsigned char* inputImage) {
+ if ((inputHeight == mDebugHeight) && (inputWidth == mDebugWidth)) {
+ ALOGV("Copying debug images");
+ memcpy(mDebugOutput, inputImage, mDebugHeight * mDebugWidth * 4);
+ }
+}
+
+void ImageTestHandler::clearDebugImage() {
+ if (mDebugOutput != NULL) {
+ delete[] mDebugOutput;
+ mDebugOutput = new unsigned char[mDebugHeight * mDebugWidth * 4];
+ memset(mDebugOutput, 0, mDebugHeight * mDebugWidth * 4);
+ }
+}
+
+
+// Draws a point of a given color.
+void ImageTestHandler::drawPoint(int row, int column, const Vec3i &color) {
+ if ((row >= 0) && (column >= 0) &&
+ (column < mDebugWidth) && (row < mDebugHeight)) {
+ mDebugOutput[(row*mDebugWidth + column) * 4] = color.r();
+ mDebugOutput[(row*mDebugWidth + column) * 4+1] = color.g();
+ mDebugOutput[(row*mDebugWidth + column) * 4+2] = color.b();
+ mDebugOutput[(row*mDebugWidth + column) * 4+3] = 255;
+ }
+}
+
+// Draws a point in Vec2 format of a given color.
+void ImageTestHandler::drawPoint(const Vec2i &point, const Vec3i &color) {
+ drawPoint((int) point.y(), (int) point.x(), color);
+}
+
+// Draws a line of a given color.
+void ImageTestHandler::drawLine(int angle, int radius, const Vec3i &color) {
+ const int r = color.r();
+ const int g = color.g();
+ const int b = color.b();
+ const int a = 255;
+
+ int shiftedMin = -113;
+ int shiftedMax = 83;
+
+ float radiusDouble = static_cast<float>(radius);
+
+ float angleRad = static_cast<float>(angle) * M_PI / 180.0;
+
+ //ALOGV("draw line for (%d, %d)", angle, radius);
+ for (int i = shiftedMin; i <= shiftedMax; ++i) {
+ float j;
+
+ assert(angle != 0);
+ j = (i - radiusDouble / sin(angleRad)) * tan(angleRad);
+ float x = (static_cast<float>(i) + j) / sqrt(2.0);
+ float y = (j - static_cast<float>(i)) / sqrt(2.0);
+
+ drawPoint(x, y, color);
+ }
+}
diff --git a/apps/CtsVerifier/lib/colorchecker/meteringtest.cpp b/apps/CtsVerifier/lib/colorchecker/meteringtest.cpp
new file mode 100644
index 0000000..47de5d8
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/meteringtest.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "MeteringTest"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <cmath>
+#include <string>
+
+#include "vec2.h"
+#include "vec3.h"
+#include "meteringtest.h"
+
+const float kOverExposure = 230.f;
+const float kEqThreshold = 0.05f;
+// Processes the checker colors stored by comparing the pixel values from the
+// two scenarios in a test.
+void MeteringTest::processData() {
+ ALOGV("Start Processing Metering Test Data!");
+
+ int numTests = mCheckerColors.size() / 2;
+ mNumPatches = 0;
+
+ if (numTests > 0) {
+ mNumPatches = mCheckerColors[0].size();
+ }
+
+ for (int i = 0; i < numTests; ++i) {
+ mComparisonResults.push_back(
+ isEquivalentTo((&mCheckerColors[i * 2]),
+ (&mCheckerColors[i * 2 + 1])));
+ mComparisonResults.push_back(
+ isDarkerThan((&mCheckerColors[i * 2]),
+ (&mCheckerColors[i * 2 + 1])));
+ }
+}
+
+void MeteringTest::clearData() {
+ mComparisonResults.clear();
+ mCheckerColors.clear();
+}
+
+// Compares two given arrays of pixel values and decide whether the first one is
+// significantly darker than the second one.
+bool MeteringTest::isDarkerThan(
+ const std::vector<Vec3f>* checkerColors1,
+ const std::vector<Vec3f>* checkerColors2) const {
+ float meanRatio = 0.f;
+ int meanNumCount = 0;
+
+ for (int i = 0; i < mNumPatches; ++i) {
+ float luminance1 = (*checkerColors1)[i].convertToLuminance();
+ float luminance2 = (*checkerColors2)[i].convertToLuminance();
+
+ // Out of the saturation rage, define 5% as a margin for being
+ // significantly brighter.
+ if ((luminance2 < kOverExposure) && (luminance1 != 0.f)) {
+ meanRatio += luminance2 / luminance1;
+ ++meanNumCount;
+ }
+ }
+ meanRatio = meanRatio / meanNumCount;
+
+ return (meanRatio > 1 + kEqThreshold);
+}
+
+// Compares the two givn arrays of pixel values and decide whether they are
+// equivalent within an acceptable range.
+bool MeteringTest::isEquivalentTo(
+ const std::vector<Vec3f>* checkerColors1,
+ const std::vector<Vec3f>* checkerColors2) const {
+ float meanRatio = 0.f;
+ int meanNumCount = 0;
+
+ for (int i = 0; i < mNumPatches; ++i) {
+ float luminance1 = (*checkerColors1)[i].convertToLuminance();
+ float luminance2 = (*checkerColors2)[i].convertToLuminance();
+ ALOGV("Luma_1 and Luma_2 is %f, %f", luminance1, luminance2);
+
+ if ((luminance1 < kOverExposure) && (luminance2 < kOverExposure)) {
+ meanRatio += luminance2 / luminance1;
+ ++meanNumCount;
+ }
+ }
+ meanRatio = meanRatio / meanNumCount;
+
+ return ((meanRatio >= 1 - kEqThreshold) && (meanRatio <= 1 + kEqThreshold));
+}
diff --git a/apps/CtsVerifier/lib/colorchecker/testingimage.cpp b/apps/CtsVerifier/lib/colorchecker/testingimage.cpp
new file mode 100644
index 0000000..28f025f
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/testingimage.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "TestingImage"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <string.h>
+#include <cmath>
+#include <vector>
+#include <assert.h>
+#include "vec3.h"
+
+#include "testingimage.h"
+
+const float GAMMA_CORRECTION = 2.2f;
+
+// Constructs an instance with the given image byte array.
+TestingImage::TestingImage(const unsigned char* inputImage,
+ int inputHeight, int inputWidth,
+ int inputChannel, int inputRowSpan) {
+ mImage = new unsigned char[inputRowSpan * inputHeight];
+
+ ALOGV("mImage format created! with size as %d, %d, %d",
+ inputRowSpan, inputHeight, inputChannel);
+ mWidth = inputWidth;
+ mHeight = inputHeight;
+ mChannels = inputChannel;
+ mRowSpan = mWidth * mChannels;
+
+ for (int i = 0; i < mHeight; ++i) {
+ for (int j = 0; j < mWidth; ++j) {
+ for (int k = 0; k < mChannels; ++k) {
+ mImage[i * mRowSpan + j* mChannels + k] =
+ inputImage[i * inputRowSpan + j * inputChannel + k];
+ }
+ }
+ }
+ ALOGV("mImage converted!");
+}
+
+// Constructs an instance with the given image and resize it to a new size.
+TestingImage::TestingImage(const unsigned char* inputImage,
+ int inputHeight, int inputWidth,
+ int inputChannel, int inputRowSpan,
+ int newHeight, int newWidth) {
+ mImage = new unsigned char[newHeight * newWidth * inputChannel];
+
+ ALOGV("mImage format created! with size as %d, %d, %d",
+ newHeight, newWidth, inputChannel);
+ mHeight = newHeight;
+ mWidth = newWidth;
+ mChannels = inputChannel;
+ mRowSpan = mWidth * mChannels;
+
+ // Computes how many pixels in the original image corresponds to one pixel
+ // in the new image.
+ int heightScale = inputHeight / newHeight;
+ int widthScale = inputWidth / newWidth;
+
+ // Average the corresponding pixels in the original image to compute the
+ // pixel value of the new image.
+ for (int i = 0; i < mHeight; ++i) {
+ for (int j = 0; j < mWidth; ++j) {
+ for (int k = 0; k < mChannels; ++k) {
+ int pixelValue = 0;
+
+ for (int l = 0; l < heightScale; ++l) {
+ for (int m = 0; m < widthScale; ++m) {
+ pixelValue += inputImage[
+ (i * heightScale + l) * inputRowSpan
+ + (j * widthScale + m) * inputChannel + k];
+ }
+ }
+ pixelValue = pixelValue / (heightScale * widthScale);
+ mImage[i * mRowSpan + j * mChannels + k] =
+ (unsigned char) pixelValue;
+ }
+ }
+ }
+}
+
+TestingImage::~TestingImage() {
+ if (mImage!=NULL) {
+ delete[] mImage;
+ }
+}
+
+int TestingImage::getPixelValue(int row, int column, int channel) const {
+ assert ((row >= 0) && (row < mHeight));
+ assert ((column >= 0) && (column < mWidth));
+ assert ((channel >= 0) && (channel < mChannels));
+ return (int)mImage[row * mRowSpan + column * mChannels + channel];
+}
+
+Vec3i TestingImage::getPixelValue(int row, int column) const {
+ Vec3i current_color(getPixelValue(row, column, 0),
+ getPixelValue(row, column, 1),
+ getPixelValue(row, column, 2));
+ return current_color;
+}
+
+Vec3i TestingImage::getPixelValue(const Vec2i &pixelPosition) const {
+ return getPixelValue(pixelPosition.x(), pixelPosition.y());
+}
+
+Vec3i TestingImage::getPixelValue(const Vec2f &pixelPosition) const {
+ return getPixelValue(static_cast<int>(pixelPosition.x()),
+ static_cast<int>(pixelPosition.y()));
+}
+
+// Returns a vector of the colors in the requested block of color checkers.
+// The vector is formatted by going through the block from left to right and
+// from top to bottom.
+const std::vector<Vec3f>* TestingImage::getColorChecker(
+ int rowStart, int rowEnd, int columnStart, int columnEnd,
+ const std::vector<std::vector< Vec2f > >* centerAddress,
+ const std::vector<std::vector< float > >* radiusAddress) const {
+ std::vector<Vec3f>* checkerColors = new std::vector<Vec3f>;
+
+ // Average the pixel values of the pixels within the given radius to the
+ // given center position.
+ for (int i = rowStart; i < rowEnd; ++i) {
+ for (int j = columnStart; j < columnEnd; ++j) {
+ float radius = sqrt((*radiusAddress)[i][j]);
+ Vec2f center((*centerAddress)[i][j].x(),
+ (*centerAddress)[i][j].y());
+ Vec3f meanColor(0.f, 0.f, 0.f);
+ int numPixels = 0;
+
+ for (int ii = static_cast<int>(center.x() - radius);
+ ii < static_cast<int>(center.x() + radius); ++ii) {
+ for (int jj = static_cast<int>(center.y() - radius);
+ jj < static_cast<int>(center.y() + radius); ++jj) {
+
+ Vec2i pixelPosition(ii,jj);
+ if (pixelPosition.squareDistance<float>(center) <
+ (*radiusAddress)[i][j]) {
+ meanColor = meanColor + getPixelValue(pixelPosition);
+ ++numPixels;
+ }
+ }
+ }
+ meanColor = meanColor / numPixels;
+ checkerColors->push_back(meanColor);
+ }
+ }
+
+ return checkerColors;
+}
+
+bool TestingImage::rgbToGrayScale(unsigned char* grayLayer) const {
+ if (mChannels == 4) {
+ for (int i = 0; i < mWidth; i++) {
+ for (int j = 0; j < mHeight; j++) {
+ float redLinear = pow(getPixelValue(j, i, 0),
+ GAMMA_CORRECTION);
+ float greenLinear = pow(getPixelValue(j,i,1),
+ GAMMA_CORRECTION);
+ float blueLinear = pow(getPixelValue(j,i,2),
+ GAMMA_CORRECTION);
+
+ // Computes the luminance value
+ grayLayer[j * mWidth + i] =
+ (unsigned char)((int)pow((0.299f * redLinear
+ + 0.587f * greenLinear
+ + 0.114f * blueLinear),
+ 1/GAMMA_CORRECTION));
+ }
+ }
+
+ return true;
+ } else {
+
+ return false;
+ }
+}
diff --git a/apps/CtsVerifier/lib/colorchecker/vec2.cpp b/apps/CtsVerifier/lib/colorchecker/vec2.cpp
new file mode 100644
index 0000000..29736bb
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/vec2.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "Vec2"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+
+#include "vec2.h"
diff --git a/apps/CtsVerifier/lib/colorchecker/vec3.cpp b/apps/CtsVerifier/lib/colorchecker/vec3.cpp
new file mode 100644
index 0000000..ac16620
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/vec3.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "Vec3"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+
+#include "vec3.h"
diff --git a/apps/CtsVerifier/lib/colorchecker/whitebalancetest.cpp b/apps/CtsVerifier/lib/colorchecker/whitebalancetest.cpp
new file mode 100644
index 0000000..6413a2b
--- /dev/null
+++ b/apps/CtsVerifier/lib/colorchecker/whitebalancetest.cpp
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "WhiteBalanceTest"
+#include <utils/Log.h>
+#include <utils/Timers.h>
+#include <cmath>
+#include <string>
+
+#include "vec2.h"
+#include "vec3.h"
+#include "whitebalancetest.h"
+
+// White point in XYZ color space under 5200k illumination.
+const Vec3f kDaylightWhitePoint(0.9781f, 1.f, 0.9021f);
+
+// Process the data of checker colors collected under different white balance.
+// Assuming the Daylight CCT is set to 5200k, compute the CCT of other white
+// balance modes.
+void WhiteBalanceTest::processData() {
+ ALOGV("Start Processing White Balance Test Data!");
+
+ int numPatches = mCheckerColors.size();
+ ALOGV("Processing %d tests with %d patches", 2, numPatches);
+
+ std::vector<Vec3f> xyzColors(numPatches);
+ for (int j = 0; j < numPatches; ++j) {
+ Vec3f xyzCheckerColor = initializeFromRGB(mCheckerColors[j]);
+ xyzColors[j] = xyzCheckerColor;
+ ALOGV("XYZ coordinate is %f, %f, %f", xyzCheckerColor.r(),
+ xyzCheckerColor.g(), xyzCheckerColor.b());
+ }
+
+ Vec3f meanScale(0.f, 0.f, 0.f);
+
+ if (mMode == "daylight") {
+ mXyzColorsDaylight = xyzColors;
+ // For testing the auto white balance mode. Compute a CCT that would
+ // map the gray checkers to a white point.
+ for (int j = 1; j < numPatches; ++j) {
+ meanScale = meanScale +
+ (mXyzColorsDaylight[j] / kDaylightWhitePoint);
+ }
+ } else {
+ for (int j = 1; j < numPatches; ++j) {
+ meanScale = meanScale + (mXyzColorsDaylight[j] / xyzColors[j]);
+ }
+ }
+
+ meanScale = meanScale / (numPatches - 1);
+ ALOGV("Scale: %f, %f, %f", meanScale.r(), meanScale.g(), meanScale.b());
+
+ Vec3f whitePoint;
+ whitePoint = meanScale * kDaylightWhitePoint;
+
+ ALOGV("White point is %f, %f, %f", whitePoint.r(),
+ whitePoint.g(), whitePoint.b());
+
+ mCorrelatedColorTemp = findCorrelatedColorTemp(whitePoint);
+ ALOGV("CCT is %d", mCorrelatedColorTemp);
+}
+
+// Given a white point, find the correlated color temperature.
+// Formula taken from the paper "Calculating Correlated Color Temperatures
+// Across the Entire Gamut of Daylight and Skylight Chromaticities" by Hernandez
+// Andres et al. in 1999. The numbers are fitting parameters.
+int WhiteBalanceTest::findCorrelatedColorTemp(const Vec3f &whitePoint) {
+ Vec2f chromaOfWhitePoint(
+ whitePoint.r() / (whitePoint.r() + whitePoint.g() + whitePoint.b()),
+ whitePoint.g() / (whitePoint.r() + whitePoint.g() + whitePoint.b()));
+
+ float n = (chromaOfWhitePoint.x() - 0.3366f)
+ / (chromaOfWhitePoint.y() - 0.1735f);
+ float y = -949.86315f + 6253.80338f * exp(-n / 0.92159f)
+ + 28.70599f * exp(-n / 0.20039f) + 0.00004f * exp(-n / 0.07125f);
+
+ return static_cast<int>(y);
+}
+
+// Converts a RGB pixel value to XYZ color space.
+Vec3f WhiteBalanceTest::initializeFromRGB(const Vec3f &rgb) {
+ float linearRed = convertToLinear(rgb.r());
+ float linearGreen = convertToLinear(rgb.g());
+ float linearBlue = convertToLinear(rgb.b());
+
+ float x = 0.4124f * linearRed + 0.3576f * linearGreen +
+ 0.1805f * linearBlue;
+ float y = 0.2126f * linearRed + 0.7152f * linearGreen +
+ 0.0722f * linearBlue;
+ float z = 0.0193f * linearRed + 0.1192f * linearGreen +
+ 0.9505f * linearBlue;
+
+ return Vec3f(x, y, z);
+}
+
+float WhiteBalanceTest::convertToLinear(float color) {
+ float norm = color/ 255.0f;
+ float linearColor;
+
+ // Convert from sRGB space to linear RGB value
+ if (norm > 0.04045f) {
+ linearColor = pow(((norm + 0.055f) / 1.055f), 2.4f);
+ } else {
+ linearColor = norm / 12.92f;
+ }
+
+ return linearColor;
+}
diff --git a/apps/CtsVerifier/res/layout/ca_main.xml b/apps/CtsVerifier/res/layout/ca_main.xml
index 98ec049..c41bcf6 100644
--- a/apps/CtsVerifier/res/layout/ca_main.xml
+++ b/apps/CtsVerifier/res/layout/ca_main.xml
@@ -19,25 +19,60 @@
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <Button android:id="@+id/runbutton" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="@string/ca_run_label" />
- <TextView android:id="@+id/resulttext" android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/ca_result_label"
- android:textSize="15sp" />
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <!--Button android:id="@+id/focusmodesbutton" android:layout_width="0px"
+ android:layout_height="wrap_content" android:text="@string/ca_focus_modes_label"
+ android:layout_weight="1" /-->
+ <Button android:id="@+id/findcheckerboardbutton" android:layout_width="0px"
+ android:layout_height="wrap_content" android:text="@string/ca_find_checkerboard_label"
+ android:layout_weight="1" />
+
+ <Button android:id="@+id/meteringbutton" android:layout_width="0px"
+ android:layout_height="wrap_content" android:text="@string/ca_metering_label"
+ android:layout_weight="1" />
+
+ <Button android:id="@+id/exposurecompensationbutton" android:layout_width="0px"
+ android:layout_height="wrap_content" android:text="@string/ca_exposure_test_label"
+ android:layout_weight="1"/>
+
+ <Button android:id="@+id/whitebalancebutton" android:layout_width="0px"
+ android:layout_height="wrap_content" android:text="@string/ca_wb_test_label"
+ android:layout_weight="1" />
+
+ <Button android:id="@+id/lockbutton" android:layout_width="0px"
+ android:layout_height="wrap_content" android:text="@string/ca_lock_test_label"
+ android:layout_weight="1" />
+ </LinearLayout>
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent" android:layout_height="wrap_content">
+ android:layout_width="fill_parent" android:layout_height="0px"
+ android:layout_weight="1">
- <SurfaceView android:id="@+id/cameraview" android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:layout_weight="1" />
+ <SurfaceView android:id="@+id/cameraview" android:layout_height="fill_parent"
+ android:layout_width="wrap_content"
+ android:layout_weight="0" />
- <ImageView android:id="@+id/resultview" android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:layout_weight="1" />
+ <LinearLayout android:orientation="vertical"
+ android:layout_width="fill_parent" android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <ListView android:id="@+id/ca_tests"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="10px"/>
+
+ <ImageView android:id="@+id/resultview" android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_weight="1" />
+ </LinearLayout>
</LinearLayout>
+
+ <include layout="@layout/pass_fail_buttons" />
+
</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/ca_row.xml b/apps/CtsVerifier/res/layout/ca_row.xml
new file mode 100644
index 0000000..0e09793
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/ca_row.xml
@@ -0,0 +1,19 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ >
+ <TextView
+ android:id="@+id/caTestName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="10px"
+ />
+ <TextView
+ android:id="@+id/caTestResult"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:layout_marginLeft="10px"
+ />
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/menu/ca_menu.xml b/apps/CtsVerifier/res/menu/ca_menu.xml
new file mode 100644
index 0000000..c33e7e8
--- /dev/null
+++ b/apps/CtsVerifier/res/menu/ca_menu.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+</menu>
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 6e7d399..0b449a5 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -101,7 +101,7 @@
<string name="da_screen_lock_test">Screen Lock Test</string>
<string name="da_screen_lock_info">This test checks that the DevicePolicyManager\'s lockNow
method immediately locks the screen. It should lock the screen immediately despite any
- settings that may specify a timeout.\n\nClick the \"Force Lock\" button to lock the screen.
+ settings that may specify a timeout.\n\nClick the \"Force Lock\" button to lock the screen.
Your screen should be locked and require the password to be entered.
</string>
<string name="da_force_lock">Force Lock</string>
@@ -206,6 +206,11 @@
button below to goto Settings and enable it.</string>
<string name="nfc_settings">NFC Settings</string>
+ <string name="ndef_push_not_enabled">NDEF Push is not enabled!</string>
+ <string name="ndef_push_not_enabled_message">These tests require Android Beam to be enabled.
+ Click the button below to goto NFC Sharing Settings and enable it.</string>
+ <string name="ndef_push_settings">NFC Sharing Settings</string>
+
<string name="nfc_pee_2_pee">Peer-to-Peer Data Exchange</string>
<string name="nfc_ndef_push_sender">NDEF Push Sender</string>
<string name="nfc_ndef_push_receiver">NDEF Push Receiver</string>
@@ -367,8 +372,14 @@
<!-- Strings for Camera Analyzer -->
<string name="camera_analyzer">Camera Analyzer</string>
- <string name="ca_run_label">Find color checker</string>
- <string name="ca_result_label">Patch values will be here</string>
+ <string name="ca_find_checkerboard_label">Find color checker</string>
+ <string name="ca_exposure_test_label">Exposure Comp. Test</string>
+ <string name="ca_result_label">Results will be here</string>
+ <string name="ca_wb_test_label">White Balance Test</string>
+ <string name="ca_lock_test_label">Auto Exposure Lock Test</string>
+ <string name="ca_metering_label">Metering Area Test</string>
+ <string name="ca_focus_modes_label">Focus Modes Test</string>
+ <string name="ca_info">This test checks the image quality of the camera of this device. It requires a MacBeth 4x6 color checker. With an ADK board and a lamp connected to it on the Relay 1 port, all tests can be run automatically. Without the ADK board, all the tests except the Auto Exposure Lock Test can be run automatically and the Auto Exposure Lock Test will require users to turn on/off a lamp according to the instruction given. </string>
<!-- Strings for USB accessory test activity -->
<string name="usb_accessory_test">USB Accessory Test</string>
diff --git a/apps/CtsVerifier/res/xml/accessory_filter_adk.xml b/apps/CtsVerifier/res/xml/accessory_filter_adk.xml
new file mode 100644
index 0000000..a5dc89a
--- /dev/null
+++ b/apps/CtsVerifier/res/xml/accessory_filter_adk.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+ <usb-accessory model="DemoKit" manufacturer="Google" version="1.0"/>
+</resources>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/AutoLockTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/AutoLockTest.java
new file mode 100644
index 0000000..6b40d2a
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/AutoLockTest.java
@@ -0,0 +1,1078 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.camera.analyzer;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.hardware.Camera;
+import android.hardware.usb.UsbAccessory;
+import android.hardware.usb.UsbManager;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Implements a test to verify whether the Auto Exposure Lock functions as
+ * described in the API.
+ *
+ * The test consists three sub-categories. The first set of tests focus on
+ * testing whether the auto exposure lock works in various situations.
+ * For all tests in this set, the lock is set during the period when the camera
+ * preview is open. In this way the lock locks exposure according to the
+ * lighting at the moment of setting the lock. The second set of tests focus on
+ * testing whether the auto exposure lock works as expected after turning the
+ * preview off and on. The lock is set during the period when the camera
+ * preview is turned off. The lock is expected to lock an exposure level
+ * identical to the one before the preview is turned off. One special case in
+ * this category is to set lock before the preview is turned on for the first
+ * time.
+ */
+public class AutoLockTest extends CameraTests {
+
+ private static final String TAG = "AutoLockTest";
+ /** USB permission to connect to ADK. */
+ private static final String ACTION_USB_PERMISSION = "com.android.cts.verifier.USB_PERMISSION";
+ /** Defines a long sleep period.*/
+ private static final int SHORT_SLEEP = 2000;
+ /** Defines a short sleep period. */
+ private static final int LONG_SLEEP = 4000;
+
+ /** Test results in text format. */
+ private String mDebugText = new String();
+ /** Detailed report. */
+ private String mResultText = new String();
+ /** Thread lock of the camera callbacks. */
+ private final Object mProcessingImage = new Object();
+ /** Memory address of the native test handler. */
+ private long mTestHandler;
+ /** Array storing the reference test results. */
+ private ArrayList<Boolean> mReferenceCompareResults;
+ /** Array storing the reference test scenario logs. */
+ private ArrayList<String> mReferenceLogs;
+ /** Number of tests so far. */
+ private int mTestCount;
+
+ /** Usb Manager of the USB connections. */
+ private UsbManager mUsbManager;
+ /** Intent for getting the permission to access the ADK. */
+ private PendingIntent mPermissionIntent;
+ /** Boolean to represent whether a permission is gained. */
+ private boolean mPermissionRequestPending;
+ /** USB accessory pointing to the ADK. */
+ private UsbAccessory mAccessory;
+ /** File descriptor of the USB communication port. */
+ private ParcelFileDescriptor mFileDescriptor;
+ /** Output stream to write commands for ADK to. */
+ private FileOutputStream mOutputStream;
+
+ /** Pointer to the CameraAnalyzerActivity activity. */
+ private CameraAnalyzerActivity mActivity;
+ /** Boolean to tell whether the accessory is opened. */
+ private boolean mSetupReady;
+ /** Thread lock for setting up the usb. */
+ private final Object mUsbSetup = new Object();
+ /** Boolean to indicate whether there is an ADK attached. */
+ private boolean mUsingUsb = false;
+ /** Test results.*/
+ private String[] mTestResults;
+ /** Number of tests. */
+ private int mNumTests;
+ /** Singleton test instance.*/
+ private static AutoLockTest singletonTest = null;
+
+ /**
+ * Receives the notice of whether the connection to ADK is granted or
+ * denied.
+ */
+ private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ Log.v(TAG, String.format("Received USB broadcast with action %s ", action));
+
+ if (ACTION_USB_PERMISSION.equals(action)) {
+ synchronized (this) {
+ UsbAccessory accessory =
+ (UsbAccessory) intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
+
+ if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
+ // Grants the permission to connect to the ADK.
+ Log.v(TAG, "Open accessory 3");
+ openAccessory(accessory);
+ // Overwrites the old camera instsance with the one currently opened
+ // by the CameraAnalyzerActivity instance, since the permission
+ // dialogue pauses the CameraAnalyzerActivity and forces the camera to
+ // be released and reopened when the dialogue disappears.
+ mTestCamera = mActivity.getCameraInstance();
+ } else {
+ // Denies the permission to connect to the ADK.
+ Log.d(TAG, "permission denied for accessory " + accessory);
+ }
+ // Marks that the permission request has been processed.
+ mPermissionRequestPending = false;
+ }
+ } else if (UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
+ // Invokes when the USB is detached.
+ // Closes the accessory if it has not been closed.
+ Log.v(TAG, "Usb device detached");
+ mUsingUsb = false;
+ UsbAccessory accessory =
+ (UsbAccessory) intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
+ if (accessory != null && accessory.equals(mAccessory)) {
+ closeAccessory();
+ }
+ }
+ }
+ };
+
+ /**
+ * Opens the ADK from USB and attaches the output stream with it.
+ *
+ * Notifies the tread lock that the USB setup is ready.
+ */
+ private void openAccessory(UsbAccessory accessory) {
+ Log.d(TAG, "openAccessory: " + accessory);
+ mFileDescriptor = mUsbManager.openAccessory(accessory);
+
+ if (mFileDescriptor != null) {
+ mAccessory = accessory;
+ FileDescriptor fd = mFileDescriptor.getFileDescriptor();
+ mOutputStream = new FileOutputStream(fd);
+ Log.d(TAG, "accessory opened");
+ } else {
+ Log.d(TAG, "accessory open fail");
+ }
+
+ // Unlocks the thread lock of waiting for the USB to be ready.
+ synchronized (mUsbSetup) {
+ mSetupReady = true;
+ Log.v(TAG, "Setup ready");
+ mUsbSetup.notifyAll();
+ }
+ }
+
+ /**
+ * Closes the ADK and detaches the output stream from it.
+ */
+ private void closeAccessory() {
+ try {
+ if (mFileDescriptor != null) {
+ mFileDescriptor.close();
+ }
+ } catch (IOException e) {
+ } finally {
+ mFileDescriptor = null;
+ mAccessory = null;
+ }
+ }
+
+ /**
+ * Constructs the AutoLockTest class, which can execute a series of tests
+ * to verify whether the device's Auto Exposure Lock is working properly.
+ *
+ * The test uses the LED lights on an ADK device as light source to change
+ * the lighting condition of the environment. The usb connection to the
+ * ADK board is established in the constructor.
+ *
+ * @param hostActivity pointer to the <code>CameraAnalyzerActivity</code>
+ * that instructs the Auto Lock Test
+ * @param mCamera pointer to the current camera instance
+ */
+ private AutoLockTest(){
+ super();
+ }
+
+ public static synchronized AutoLockTest getSingletonTest() {
+ if (singletonTest == null) {
+ Log.v(TAG, "Creating a new AutoLockTest instance");
+ singletonTest = new AutoLockTest();
+ singletonTest.initializeTest();
+ }
+ return singletonTest;
+ }
+
+ private void initializeTest() {
+ // Creates a native test handler with a 120x160 pixel debug output
+ mTestHandler = createAutoLockTest();
+ mReferenceCompareResults = new ArrayList<Boolean>();
+ mReferenceLogs = new ArrayList<String>();
+ mNumTests = 4;
+ mTestResults = new String[mNumTests];
+ for (int i = 0; i < mNumTests; ++i) {
+ mTestResults[i] = "...";
+ }
+ }
+
+ public void updateCamera() {}
+
+ public void setActivity(CameraAnalyzerActivity hostActivity){
+ if (mUsingUsb) {
+ closeConnection();
+ }
+
+ mActivity = hostActivity;
+
+ mSetupReady = false;
+
+ Log.v(TAG, "Start to test ADK connection");
+ // Starts to establish the connection to the ADK board.
+ mUsbManager = (UsbManager) mActivity.getSystemService(Context.USB_SERVICE);
+ mPermissionIntent = PendingIntent.getBroadcast(mActivity, 0,
+ new Intent(ACTION_USB_PERMISSION), 0);
+ IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
+ filter.addAction(UsbManager.ACTION_USB_ACCESSORY_DETACHED);
+ filter.addAction(UsbManager.ACTION_USB_ACCESSORY_ATTACHED);
+ mActivity.registerReceiver(mUsbReceiver, filter);
+
+ if (mActivity.getLastNonConfigurationInstance() != null) {
+ mAccessory = (UsbAccessory) mActivity.getLastNonConfigurationInstance();
+ Log.v(TAG, "Open acceossory 1");
+ openAccessory(mAccessory);
+ }
+
+ // Skips the permission listener if the user already grants the ADK
+ // permission previously in the app.
+ UsbAccessory[] accessories = mUsbManager.getAccessoryList();
+ UsbAccessory accessory = (accessories == null ? null : accessories[0]);
+ if (accessory != null) {
+ if (mUsbManager.hasPermission(accessory)) {
+ Log.v(TAG, "Open accessory 2");
+ openAccessory(accessory);
+ } else {
+ synchronized (mUsbReceiver) {
+ if (!mPermissionRequestPending) {
+ mUsbManager.requestPermission(accessory, mPermissionIntent);
+ mPermissionRequestPending = true;
+ }
+ }
+ }
+ mUsingUsb = true;
+ } else {
+ Log.d(TAG, "accessory is null");
+ mUsingUsb = false;
+ }
+
+ }
+
+ /**
+ * Closes the accessories and unregister the USB listener at the end of
+ * tests.
+ */
+ public void closeConnection() {
+ closeAccessory();
+ mActivity.unregisterReceiver(mUsbReceiver);
+ }
+
+ protected void finalize () {
+ if (mUsingUsb) {
+ closeConnection();
+ }
+ }
+
+ /**
+ * Runs the Auto Lock tests. A total of 19 tests have been coded and
+ * included. Developers can freely comment out tests not interested. In
+ * the release version, all tests will be executed.
+ */
+ @Override
+ public synchronized void run(int index){
+ if (index == 0) {
+ for (int i = 1; i < mNumTests; ++i) {
+ run(i);
+ }
+ return;
+ }
+
+ Log.v(TAG, "AutoLockTest thread started!");
+
+ if (mUsingUsb && (!mSetupReady)) {
+ // USB connection is not set up. Locks thread and wait.
+ Log.v(TAG, "Setup not ready, waiting");
+ synchronized (mUsbSetup) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+ mUsbSetup.wait();
+ } catch (InterruptedException e) {
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+
+ // Restarts the camera intance and attach the preview to the corrent
+ // UI elements.
+ restartCamera();
+ startPreview();
+
+ mTestCount = 0;
+ switch (index) {
+ case 1:
+ Log.v(TAG, "SP -> TP1 -> SP -> +1 -> Lock -> -1 -> TP2");
+ test0();
+ Log.v(TAG, "SP -> TP1 -> SP -> Lock -> +1 -> TP2 -> -1");
+ test1();
+ Log.v(TAG, "SP -> Lock -> +1 -> TP1 -> SP -> -1 -> Lock -> TP2");
+ test2();
+ Log.v(TAG, "SP -> Lock -> +1 -> TP1 -> SP -> Lock -> -1 -> TP2");
+ test3();
+ break;
+ case 2:
+ Log.v(TAG, "SP -> +1 -> TP1 -> -1 -> Lock -> SP -> TP2");
+ test4();
+ Log.v(TAG, "SP -> +1 -> TP1 -> Lock -> SP -> -1 -> TP2");
+ test5();
+ Log.v(TAG, "SP -> TP1 -> +1 -> Lock -> SP -> -1 -> TP2");
+ test6();
+ Log.v(TAG, "SP -> TP1 -> +1 -> Lock -> SP -> TP2");
+ test7();
+ Log.v(TAG, "SP -> TP1 -> Lock -> SP -> +1 -> TP2");
+ test8();
+ Log.v(TAG, "SP -> +1 -> Lock -> -1 -> TP1 -> Lock -> SP -> TP2");
+ test9();
+ Log.v(TAG, "SP -> +1 -> Lock -> TP1 -> -1 -> Lock -> SP -> TP2");
+ test10();
+ Log.v(TAG, "SP -> Lock -> TP1 -> +1 -> Lock -> SP -> -1 -> TP2");
+ test11();
+ break;
+ case 3:
+ Log.v(TAG, "Restart -> Lock -> SP -> TP1 -> Restart -> Lock -> SP -> +1 -> TP2");
+ test12();
+ Log.v(TAG, "Restart -> Lock -> SP -> +1 -> TP1 -> -1 -> Lock -> SP -> TP2");
+ test13();
+ Log.v(TAG, "Restart -> Lock -> SP -> +1 -> TP1 -> Lock -> SP -> -1 -> TP2");
+ test14();
+ Log.v(TAG, "Restart -> Lock -> SP -> TP1 -> +1 -> Lock -> SP -> -1 -> TP2");
+ test15();
+ Log.v(TAG, "Restart -> Lock -> SP -> TP1 -> +1 -> Lock -> SP -> TP2");
+ test16();
+ Log.v(TAG, "Restart -> Lock -> SP -> TP1 -> Lock -> SP -> +1 -> TP2");
+ test17();
+ Log.v(TAG, "Restart -> Lock -> SP -> TP1 -> Lock -> SP -> TP2");
+ test18();
+ break;
+ default:
+ break;
+ }
+
+ releaseLock();
+
+ Log.v(TAG, "Ready to process data");
+ boolean[] testCompareResults = new boolean[2 * mTestCount];
+
+ // Processes the data stored in the native test handler instance.
+ // Stores the test results into a boolean array.
+ processAutoLockTest(mTestHandler, testCompareResults);
+
+ // Prepares the test result text output with the booelan result array.
+ prepareDebugText(testCompareResults, index);
+ mReferenceCompareResults.clear();
+ mReferenceLogs.clear();
+ }
+
+ /**
+ * Compares two images taken under the same lighting, Image 1 without AE
+ * lock and Image 2 with AE locked under a bright light. Image 1 is
+ * expected to be brighter than Image 2.
+ * Tests whether AE lock works compared to no AE lock.
+ */
+ private void test0() {
+ releaseLock();
+ takePicture();
+ startPreview();
+ turnOnLight();
+ setLock();
+ turnOffLight();
+ takePicture();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Same lighting condition with one different lock");
+ ++mTestCount;
+ }
+
+ /**
+ * Compares two images taken under different lighting, Image 1 without AE
+ * lock and Image 2 with with AE locked under the same light Image 1 is
+ * taken. Image 2 is taken under a bright light. Image 1 is expected to be
+ * darker than Image 2.
+ * Tests whether AE lock works compared to no AE lock.
+ */
+ private void test1() {
+ releaseLock();
+ takePicture();
+ startPreview();
+ setLock();
+ turnOnLight();
+ takePicture();
+ turnOffLight();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("One same lock with different lighting");
+ ++mTestCount;
+ }
+
+ /**
+ * Compares two images taken under different light, both with AE locked
+ * under the same lighting. Image 1 is taken under a brighter light.
+ * Image 1 is expected to be brighter than Image 2.
+ * Tests whether AE locks the exposure to the same level in the same
+ * lighting condition after preview restarts.
+ */
+ private void test2() {
+ releaseLock();
+ setLock();
+ turnOnLight();
+ takePicture();
+ startPreview();
+ turnOffLight();
+ setLock();
+ takePicture();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Same locking locations with different lighting");
+ ++mTestCount;
+ }
+
+ /**
+ * Compares two images taken under different light, Image 1 with AE locked
+ * under normal light and Image 2 with AE locked under a bright light.
+ * Image 1 is taken under a bright light and Image 2 is taken in the normal
+ * lighting. Image 1 is expected to be brighter than Image 2.
+ * Tests whether AE lock can adjust to change of lighting conditions.
+ */
+ private void test3() {
+ releaseLock();
+ setLock();
+ turnOnLight();
+ takePicture();
+ startPreview();
+ setLock();
+ turnOffLight();
+ takePicture();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Different locking locations with different lighting");
+ ++mTestCount;
+ }
+
+ /**
+ * Compares two images taken under different lighting, Image 1 without
+ * AE lock and Image 2 with AE lock set before camera preview resumes.
+ * Image 1 is taken under a bright light and the light is turned off before
+ * camera preview starts again. Image 1 is expected to be brighter than
+ * Image 2.
+ * Tests whether setting AE lock between camera preview stops and restarts
+ * can retain the exposure level of the previous AE-unlocked photo.
+ */
+ private void test4() {
+ releaseLock();
+ turnOnLight();
+ takePicture();
+ turnOffLight();
+ setLock();
+ startPreview();
+ takePicture();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after takePicture and light change, before preview");
+ ++mTestCount;
+ }
+
+ /**
+ * Compares two images taken under different lighting, Image 1 without
+ * AE lock and Image 2 with AE lock set before camera preview resumes.
+ * Image 1 is taken under a bright light and the light is turned off after
+ * preview restars but before Image 2 is taken. Image 1 is expected to be
+ * brighter than Image 2.
+ * Tests whether setting AE lock between camera preview stops and restarts
+ * can retain the exposure level of the previous AE-unlocked photo.
+ */
+ private void test5() {
+ releaseLock();
+ turnOnLight();
+ takePicture();
+ setLock();
+ startPreview();
+ turnOffLight();
+ takePicture();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock between takePicture and light change, w/o light change");
+ ++mTestCount;
+ }
+
+ private void test6() {
+ releaseLock();
+ takePicture();
+ turnOnLight();
+ setLock();
+ startPreview();
+ turnOffLight();
+ takePicture();
+ startPreview();
+ releaseLock();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add("Lock after takePicture and light change, before preview.");
+ ++mTestCount;
+ }
+
+ private void test7() {
+ releaseLock();
+ takePicture();
+ turnOnLight();
+ setLock();
+ startPreview();
+ takePicture();
+ startPreview();
+ releaseLock();
+ turnOffLight();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after takePicture and light change, before preview.");
+ ++mTestCount;
+ }
+
+ private void test8() {
+ releaseLock();
+ takePicture();
+ setLock();
+ startPreview();
+ turnOnLight();
+ takePicture();
+ startPreview();
+ releaseLock();
+ turnOffLight();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after takePicture and before startPreview.");
+ ++mTestCount;
+ }
+
+ private void test9() {
+ releaseLock();
+ turnOnLight();
+ setLock();
+ turnOffLight();
+ takePicture();
+ setLock();
+ startPreview();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test10() {
+ releaseLock();
+ turnOnLight();
+ setLock();
+ takePicture();
+ turnOffLight();
+ setLock();
+ startPreview();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test11() {
+ releaseLock();
+ setLock();
+ takePicture();
+ turnOnLight();
+ setLock();
+ startPreview();
+ turnOffLight();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test12() {
+ //"Restart -> Lock -> SP -> TP1 -> Restart -> Lock -> SP -> +1 -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ takePicture();
+ releaseLock();
+ restartCamera();
+ setLock();
+ startPreview();
+ turnOnLight();
+ takePicture();
+ releaseLock();
+ turnOffLight();
+ startPreview();
+ //mTestCamera.release();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock before first preview");
+ ++mTestCount;
+ }
+
+ private void test13() {
+ //"Restart -> Lock -> SP -> +1 -> TP1 -> -1 -> Lock -> SP -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ turnOnLight();
+ takePicture();
+ turnOffLight();
+ setLock();
+ startPreview();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test14() {
+ //"Restart -> Lock -> SP -> +1 -> TP1 -> Lock -> SP -> -1 -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ turnOnLight();
+ takePicture();
+ setLock();
+ startPreview();
+ turnOffLight();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test15() {
+ //"Restart -> Lock -> SP -> TP1 -> +1 -> Lock -> SP -> -1 -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ takePicture();
+ turnOnLight();
+ setLock();
+ startPreview();
+ turnOffLight();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test16() {
+ //"Restart -> Lock -> SP -> TP1 -> +1 -> Lock -> SP -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ takePicture();
+ turnOnLight();
+ setLock();
+ startPreview();
+ takePicture();
+ turnOffLight();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test17() {
+ //"Restart -> Lock -> SP -> TP1 -> Lock -> SP -> +1 -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ takePicture();
+ setLock();
+ startPreview();
+ turnOnLight();
+ takePicture();
+ turnOffLight();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ private void test18() {
+ //"Restart -> Lock -> SP -> TP1 -> Lock -> SP -> TP2"
+ restartCamera();
+ setLock();
+ startPreview();
+ takePicture();
+ setLock();
+ startPreview();
+ takePicture();
+ releaseLock();
+ startPreview();
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add("Lock after first lock with changing light");
+ ++mTestCount;
+ }
+
+ /**
+ * Restarts the camera by releasing the current instance and get a new
+ * instance. Also connects this new camera instance's preview to the proper
+ * UI surfaceview.
+ */
+ private void restartCamera() {
+ Log.v(TAG, "Restarting Camera");
+
+ mTestCamera.release();
+ Log.v(TAG, "Camera released");
+
+ try {
+ mTestCamera = Camera.open(mActivity.getCameraIdx());
+ } catch (RuntimeException e) {
+ throw new RuntimeException("Failed to open the camera", e);
+ }
+
+ Camera.Parameters params = mTestCamera.getParameters();
+ params.setPictureFormat(ImageFormat.JPEG);
+ params.setPictureSize(640, 480);
+ mTestCamera.setParameters(params);
+
+ try {
+ mTestCamera.setPreviewDisplay(super.getCameraView().getHolder());
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to connect camera to display: " + e);
+ }
+ }
+
+ /**
+ * Starts Camera preview with a delay of 2 seconds to let it adjust to
+ * the lighting condition.
+ */
+ private void startPreview() {
+ mTestCamera.startPreview();
+ try{
+ Log.v(TAG, "Waiting");
+ Thread.sleep(2000);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){}
+ }
+
+ /**
+ * Sends command to ADK to turn on all the LED lights to white.
+ * Waits for 4 seconds for the camera to adjust to the new lighting.
+ */
+ private void turnOnLight() {
+ Log.v(TAG, "Turn on light");
+ if (mUsingUsb) {
+ byte[] buffer = new byte[3];
+
+ buffer[0] = (byte) 3;
+ buffer[1] = (byte) 0;
+ buffer[2] = (byte) 1;
+ if (mOutputStream != null && buffer[1] != -1) {
+ try {
+ mOutputStream.write(buffer);
+ } catch (IOException e) {
+ Log.e(TAG, "write failed", e);
+ }
+ }
+ } else {
+ mActivity.runOnUiThread(new Runnable() {
+ public void run() {
+ Toast.makeText(mActivity.getApplicationContext(), "Turn on light!", 4).show();
+
+ }
+ });
+ }
+
+ try{
+ Log.v(TAG, "Waiting, Please Turn on light");
+ Thread.sleep(LONG_SLEEP);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){}
+ }
+
+ /**
+ * Sends command to ADK to turn off all LED lights.
+ * Waits for 4 seconds for the camera to adjust to the new lighting.
+ */
+ private void turnOffLight() {
+ Log.v(TAG, "Turn off light");
+ if (mUsingUsb) {
+ byte[] buffer = new byte[3];
+
+ buffer[0] = (byte) 3;
+ buffer[1] = (byte) 0;
+ buffer[2] = (byte) 0;
+ if (mOutputStream != null && buffer[1] != -1) {
+ try {
+ mOutputStream.write(buffer);
+ } catch (IOException e) {
+ Log.e(TAG, "write failed", e);
+ }
+ }
+ } else {
+ mActivity.runOnUiThread(new Runnable() {
+ public void run() {
+ Toast.makeText(mActivity.getApplicationContext(), "Turn off light!", 4).show();
+
+ }
+ });
+ }
+
+ try{
+ Log.v(TAG, "Waiting, Please Turn off light");
+ Thread.sleep(LONG_SLEEP);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){}
+ }
+
+ /**
+ * Sets the Auto Exposure Lock.
+ * Waits for 2 seonds for the lock to function.
+ */
+ private void setLock() {
+ Camera.Parameters params = mTestCamera.getParameters();
+
+ params.setAutoExposureLock(true);
+ params.setAutoWhiteBalanceLock(true);
+ mTestCamera.setParameters(params);
+ try{
+ Log.v(TAG, "Waiting to set lock");
+ Thread.sleep(2000);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){}
+ }
+
+ /**
+ * Releases the Auto Exposure Lock.
+ * Waits for 4 seconds afterwards for the Auto Exposure to be adjusted
+ * to the lighting condition.
+ */
+ private void releaseLock() {
+ Camera.Parameters params = mTestCamera.getParameters();
+
+ params.setAutoExposureLock(false);
+ params.setAutoWhiteBalanceLock(false);
+ mTestCamera.setParameters(params);
+ try{
+ Log.v(TAG, "Waiting to release lock");
+ Thread.sleep(LONG_SLEEP);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){}
+
+ }
+
+ /**
+ * Takes a picture and locks thread until the picture callback finishes.
+ */
+ private void takePicture(){
+ mTestCamera.takePicture(null, null, null, mTestJpegListener);
+
+ synchronized (mProcessingImage) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+ // System.gc();
+ mProcessingImage.wait();
+ } catch (InterruptedException e){
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+
+ /**
+ * Prepare for the result to be shown in the UI. The result for each single
+ * test is shown in green if it matches the reference result. It is shown
+ * in red otherwise.
+ */
+ private void prepareDebugText(boolean[] testCompareResults, int index) {
+ boolean groupTestPassed = true;
+ for (int i = 0; i < mTestCount; ++i) {
+ String testLog;
+ boolean testPassed = true;
+ testLog = mReferenceLogs.get(i);
+ mDebugText += (testLog + "<br/>");
+
+ if (testCompareResults[i * 2] == mReferenceCompareResults.get(i * 2)) {
+ mDebugText += String.format(
+ "Picture 1 brighter than Picture 2 is %b \n",
+ testCompareResults[i * 2]);
+ } else {
+ mDebugText += String.format(
+ "Picture 1 brighter than Picture 2 is %b \n",
+ testCompareResults[i * 2]);
+ testPassed = false;
+ }
+
+ if (testCompareResults[i * 2 + 1] == mReferenceCompareResults.get(i * 2 + 1)) {
+ mDebugText += String.format(
+ "Picture 1 is equivalent to Picture 2 is %b \n",
+ testCompareResults[i * 2 + 1]);
+ } else {
+ mDebugText += String.format(
+ "Picture 1 is equivalent to Picture 2 is %b \n",
+ testCompareResults[i * 2 + 1]);
+ testPassed = false;
+ }
+
+ if (testPassed) {
+ mDebugText += "Test passed! \n";
+ } else {
+ mDebugText += "Test failed! \n";
+ groupTestPassed = false;
+ }
+ }
+ if (groupTestPassed) {
+ mTestResults[index] = "Passed";
+ } else {
+ mTestResults[index] = "Failed";
+ }
+ }
+
+ /**
+ * Clears the debug text so that new test results can be added.
+ */
+ public void clearDebugText() {
+ mDebugText = "";
+ }
+
+ @Override
+ public String getDebugText() {
+ return mDebugText;
+ }
+
+ @Override
+ public String getResultText() {
+ return mDebugText;
+ }
+
+ @Override
+ public String getTestName() {
+ return "Auto Exposure Lock test: \n";
+ }
+
+ @Override
+ public String getTestName(int index) {
+ switch (index) {
+ case 0:
+ return "Run all tests";
+ case 1:
+ return "Compulsory tests";
+ case 2:
+ return "Recommended tests (preview behavior)";
+ case 3:
+ return "Optional tests (default lock)";
+ default:
+ return "";
+ }
+ }
+
+ @Override
+ public String getResult(int index) {
+ return mTestResults[index];
+ }
+
+ @Override
+ public int getNumTests() {
+ return mNumTests;
+ }
+
+ private Camera.PictureCallback mTestJpegListener = new Camera.PictureCallback() {
+ public void onPictureTaken(byte[] data, Camera mCamera) {
+ Log.v(TAG, "Shutter pressed down!");
+ Bitmap inputImage;
+
+ // Decodes the camera input data into Bitmap.
+ // Constructs a native image class with the image.
+ inputImage = BitmapFactory.decodeByteArray(data, 0, data.length);
+ long bufferAddress = findNative(inputImage);
+ Log.v(TAG, "findNative method finishes");
+
+ // Cleans up memory taken by the Bitmap.
+ data = null;
+ inputImage.recycle();
+ inputImage = null;
+ System.gc();
+
+ // Passes data from the native image class to the native
+ // test handler.
+ createAutoLockClass(bufferAddress, mTestHandler,
+ getCheckerCenter(), getCheckerRadius());
+
+ // Unlocks the thread lock.
+ synchronized (mProcessingImage) {
+ mProcessingImage.notifyAll();
+ }
+ }
+ };
+
+ private native long createAutoLockTest();
+
+ private native void createAutoLockClass(long bufferAddress, long handlerAddress,
+ long checkerCenterAddress,
+ long checkerRadiusAddress);
+
+ private native void processAutoLockTest(long handlerAddress, boolean[] testCompareResults);
+
+ static {
+ System.loadLibrary("cameraanalyzer");
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraAnalyzerActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraAnalyzerActivity.java
index b50dd9e..ffe9d06 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraAnalyzerActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraAnalyzerActivity.java
@@ -15,6 +15,7 @@
*/
package com.android.cts.verifier.camera.analyzer;
+import com.android.cts.verifier.PassFailButtons;
import com.android.cts.verifier.R;
import android.app.Activity;
@@ -22,112 +23,459 @@
import android.graphics.BitmapFactory;
import android.graphics.ImageFormat;
import android.hardware.Camera;
+import android.hardware.Camera.CameraInfo;
+import android.hardware.Camera.Size;
+import android.os.AsyncTask;
import android.os.Bundle;
+import android.text.Html;
+import android.text.method.ScrollingMovementMethod;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
import android.widget.ImageView;
+import android.widget.ListView;
import android.widget.TextView;
+import android.widget.Button;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.content.Context;
import java.io.IOException;
+import java.lang.Thread;
+import java.util.List;
-public class CameraAnalyzerActivity extends Activity {
+/**
+ * Controls the UI activities of the camera quality test app. It is created
+ * as soon as the app started. Users can launch different quality tests with
+ * the buttons in the UI. This class will manage the threading for different
+ * tests. Also it will provide debug output or debug text results for tests.
+ */
+public class CameraAnalyzerActivity extends PassFailButtons.Activity {
- Bitmap mInputImage;
- TextView mResultText;
- SurfaceView mCameraView;
- ImageView mResultView;
- Camera mCamera;
- boolean mProcessingPicture = false;
+ private static final String TAG = "CameraAnalyzer";
+ private SurfaceView mCameraView;
+ private ImageView mResultView;
+ private Button mFindCheckerButton;
+ private Button mExposureCompensationButton;
+ private Button mWhiteBalanceButton;
+ private Button mAutoLockButton;
+ private Button mMeteringButton;
+ private ListView mTestList;
+ private TwoColumnAdapter mAdapter;
+
+ private Camera mCamera;
+ private int mCameraIdx = 0;
+ private boolean mIsCameraOpen = false;
+
+ private PowerManager mPowerManager;
+ private PowerManager.WakeLock mWakeLock;
+
+ private boolean mProcessingPicture = false;
+ private boolean mTestInProgress = false;
+ private final Object mProcessingTest = new Object();
+ private CameraTests mCurrentTest = null;
+
+ private long mCheckerCenterAddress;
+ private long mCheckerRadiusAddress;
+
+ private String mResultReport = "";
+ static final String[] TESTS = new String[] {"Test1", "Test2"};
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.ca_main);
+ setPassFailButtonClickListeners();
+ setInfoResources(R.string.camera_analyzer, R.string.ca_info, -1);
- findViewById(R.id.runbutton).setOnClickListener(mRunListener);
+ mFindCheckerButton = (Button) findViewById(R.id.findcheckerboardbutton);
+ mExposureCompensationButton = (Button) findViewById(R.id.exposurecompensationbutton);
+ mWhiteBalanceButton = (Button) findViewById(R.id.whitebalancebutton);
+ mAutoLockButton = (Button) findViewById(R.id.lockbutton);
+ mMeteringButton = (Button) findViewById(R.id.meteringbutton);
+ mCameraView = (SurfaceView) findViewById(R.id.cameraview);
+ mResultView = (ImageView) findViewById(R.id.resultview);
+ mTestList = (ListView) findViewById(R.id.ca_tests);
+ mAdapter = new TwoColumnAdapter(this);
- mCameraView = (SurfaceView)findViewById(R.id.cameraview);
- mResultView = (ImageView)findViewById(R.id.resultview);
- mResultText = (TextView)findViewById(R.id.resulttext);
+ // Initialize the list view.
+ initializeAdapter();
+ mTestList.setAdapter(mAdapter);
+ mTestList.setOnItemClickListener(mListListener);
+
+ mFindCheckerButton.setOnClickListener(mFindCheckerListener);
+ mExposureCompensationButton.setOnClickListener(mExposureCompensationListener);
+ mWhiteBalanceButton.setOnClickListener(mWhiteBalanceListener);
+ mAutoLockButton.setOnClickListener(mAutoLockListener);
+ mMeteringButton.setOnClickListener(mMeteringListener);
mCameraView.getHolder().addCallback(mSurfaceChangeListener);
+
+ // Disables all test buttons except the color checker test one.
+ // They will be enabled after the color checker is located.
+ mExposureCompensationButton.setEnabled(false);
+ mWhiteBalanceButton.setEnabled(false);
+ mAutoLockButton.setEnabled(false);
+ mMeteringButton.setEnabled(false);
}
@Override
public void onResume() {
super.onResume();
- mCamera = Camera.open(0);
+
+ openCamera(mCameraIdx);
Camera.Parameters params = mCamera.getParameters();
params.setPictureFormat(ImageFormat.JPEG);
+ params.setPictureSize(640, 480);
mCamera.setParameters(params);
+ Log.v(TAG, "Set resolution to 640*480");
}
@Override
public void onPause() {
super.onPause();
- mCamera.release();
+ CameraTests.getCamera().release();
+ mIsCameraOpen = false;
}
- private View.OnClickListener mRunListener = new View.OnClickListener() {
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.ca_menu, menu);
+
+ Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+ int cameraCount = Camera.getNumberOfCameras();
+ for (int camIdx = 0; camIdx < cameraCount; ++camIdx) {
+ MenuItem cameraMenuItem = menu.add(0, camIdx, Menu.NONE,
+ String.format("Open Camera %d", camIdx));
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() != mCameraIdx) {
+ mCameraIdx = item.getItemId();
+ new SwitchCameraTask().execute(mCameraIdx);
+ }
+ return false;
+ }
+
+ private class SwitchCameraTask extends AsyncTask<Integer, Void, Void> {
+ @Override
+ protected Void doInBackground(Integer... camIdx) {
+ if (mTestInProgress) {
+ synchronized (mProcessingTest) {
+ try{
+ Log.v(TAG, "Waiting for test to finish");
+ mProcessingTest.wait();
+ } catch (InterruptedException e){
+ Log.v(TAG, "test wait fails!");
+ }
+ }
+ }
+
+ openCamera((int)camIdx[0]);
+ return null;
+ }
+ }
+
+ private synchronized void openCamera(int camIdx) {
+ if (mIsCameraOpen) {
+ CameraTests.getCamera().release();
+ Log.v(TAG, "Releasing the cameratests camera");
+ }
+ try {
+ mCamera = Camera.open(camIdx);
+ mIsCameraOpen = true;
+ } catch (RuntimeException e) {
+ throw new RuntimeException("Failed to open the camera", e);
+ }
+
+ try {
+ mCamera.setPreviewDisplay(mCameraView.getHolder());
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to connect camera to display: " + e);
+ }
+ mCamera.startPreview();
+ CameraTests.setCamera(mCamera);
+
+ ColorCheckerTest.getSingletonTest().updateCamera();
+ WhiteBalanceTest.getSingletonTest().updateCamera();
+ ExposureCompensationTest.getSingletonTest().updateCamera();
+ MeteringTest.getSingletonTest().updateCamera();
+ AutoLockTest.getSingletonTest().updateCamera();
+ }
+
+ public Camera getCameraInstance() {
+ return mCamera;
+ }
+
+ public void disableAll() {
+ mExposureCompensationButton.setEnabled(false);
+ mWhiteBalanceButton.setEnabled(false);
+ mAutoLockButton.setEnabled(false);
+ mMeteringButton.setEnabled(false);
+ mFindCheckerButton.setEnabled(false);
+ }
+
+ public void enableAll() {
+ mExposureCompensationButton.setEnabled(true);
+ mWhiteBalanceButton.setEnabled(true);
+ mAutoLockButton.setEnabled(true);
+ mMeteringButton.setEnabled(true);
+ mFindCheckerButton.setEnabled(true);
+ }
+
+ /**
+ * Provides an abstraction for the Camera tests. The camera tests will
+ * run in the background and the results will be shown in the UI thread
+ * after the tests are processed.
+ */
+ private class DebugOutputProcessingTask extends AsyncTask<Integer,
+ Integer,
+ Integer> {
+ @Override
+ protected Integer doInBackground(Integer... cameraTestIndex) {
+ Log.v(TAG, "Do in Background started!");
+
+ mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+ mWakeLock = mPowerManager.newWakeLock(
+ PowerManager.SCREEN_DIM_WAKE_LOCK, "CameraQualityTest");
+ mWakeLock.acquire();
+
+ mTestInProgress = true;
+
+ // Processes the camera tests one by one and publishes their
+ // debug output or debug text results after each test is done.
+ mCurrentTest.run((int)cameraTestIndex[0]);
+ publishProgress(cameraTestIndex);
+
+ Log.v(TAG, "Do in Background thread returns!");
+ return cameraTestIndex[0];
+ }
+
+ @Override
+ protected void onProgressUpdate(Integer... cameraTestIndex) {
+ Log.v(TAG, "Prepare to get debug output!");
+
+ // Copies the debug output image or text results to the UI.
+ mResultView.setImageBitmap(mCurrentTest.getDebugOutput());
+ mResultReport += (mCurrentTest.getTestName() + mCurrentTest.getDebugText());
+ mAdapter.notifyDataSetChanged();
+ }
+
+ @Override
+ protected void onPostExecute(Integer cameraTestIndex) {
+
+ // If the test is to find the color checker, copy the memory
+ // address of the found color checker centers and radius to the
+ // CameraTests class' static fields.
+ if (mCurrentTest.copyCheckerAddress()) {
+ mCheckerCenterAddress = CameraTests.getCheckerCenter();
+ mCheckerRadiusAddress = CameraTests.getCheckerRadius();
+ }
+
+ if (mCurrentTest.copyCheckerAddress() ||
+ !mCurrentTest.getTestName().contains("Color Checker")) {
+ // Enables the button of all other tests after the color checker
+ // is found. Now the user can start all other available tests.
+ enableAll();
+ }
+
+ mWakeLock.release();
+ mTestInProgress = false;
+ synchronized (mProcessingTest) {
+ mProcessingTest.notifyAll();
+ }
+
+ }
+ }
+
+ // Creates and runs a new test to find color checker in the captured image.
+ // It is invoked when users press the Find color checker button in the UI.
+ private View.OnClickListener mFindCheckerListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (!mProcessingPicture) {
- mCamera.takePicture(null, null, null, mJpegListener);
- mProcessingPicture = true;
- }
+ Log.v(TAG, "Running new color checker finding tests!");
+ ColorCheckerTest colorCheckerTest = ColorCheckerTest.getSingletonTest();
+
+ mCurrentTest = colorCheckerTest;
+ initializeAdapter();
}
};
- private Camera.PictureCallback mJpegListener = new Camera.PictureCallback() {
- public void onPictureTaken(byte[] data, Camera mCamera) {
- mCamera.startPreview();
- mInputImage = BitmapFactory.decodeByteArray(data, 0, data.length);
- ColorChecker checker = new ColorChecker(mInputImage);
- mResultView.setImageBitmap(checker.getDebugOutput());
- if (checker.isValid()) {
- String patchValueTxt = new String();
- for (int y = 0; y < 4; y++) {
- for (int x = 0; x < 6; x++) {
- patchValueTxt +=
- String.format("[ %.3f, %.3f, %.3f] ",
- checker.getPatchValue(x,y,0),
- checker.getPatchValue(x,y,1),
- checker.getPatchValue(x,y,2));
- }
- patchValueTxt += "\n";
- }
- mResultText.setText(patchValueTxt);
- } else {
- mResultText.setText("Can't find color checker!");
+ // Creates and runs a new test to test the exposure compensation function.
+ // It is invoked when users press the Exposure Compensation Test button
+ // in the UI.
+ private View.OnClickListener mExposureCompensationListener = new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Log.v(TAG, "Running new exposure compensation tests!");
+
+ ExposureCompensationTest exposureCompensationTest =
+ ExposureCompensationTest.getSingletonTest();
+
+ mCurrentTest = exposureCompensationTest;
+ initializeAdapter();
+
+ // Loads the memory address of the checker centers and radius
+ // from the this class and set the two values for the new test.
+ ExposureCompensationTest.setCheckerAddress(mCheckerCenterAddress,
+ mCheckerRadiusAddress);
+ }
+ };
+
+ // Creates and runs a new test to test the white balance function.
+ // It is invoked when users press the White Balance Test button in the UI.
+ private View.OnClickListener mWhiteBalanceListener = new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Log.v(TAG, "Running new white balance tests!");
+
+ WhiteBalanceTest whiteBalanceTest = WhiteBalanceTest.getSingletonTest();
+
+ mCurrentTest = whiteBalanceTest;
+ initializeAdapter();
+
+ // Loads the memory address of the checker centers and radius
+ // from the this class and set the two values for the new test.
+ WhiteBalanceTest.setCheckerAddress(mCheckerCenterAddress, mCheckerRadiusAddress);
+ }
+ };
+
+ // Creates and runs a new test to test the camera metering function.
+ // It is invoked when users press the Metering Test button in the UI.
+ private View.OnClickListener mMeteringListener = new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Log.v(TAG, "Running new metering tests!");
+
+ MeteringTest meteringTest = MeteringTest.getSingletonTest();
+
+ mCurrentTest = meteringTest;
+ initializeAdapter();
+
+ // Loads the memory address of the checker centers and radius
+ // from the this class and set the two values for the new test.
+ MeteringTest.setCheckerAddress(mCheckerCenterAddress, mCheckerRadiusAddress);
+ }
+ };
+
+ // Creates and runs new tests to test the camera auto exposure lock.
+ // It is invoked when users press the AWB and AE Lock Test button
+ // in the UI.
+ private View.OnClickListener mAutoLockListener = new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Log.v(TAG, "Running New auto exposure/wb lock tests!");
+
+ // Loads the memory address of the checker centers and radius
+ // from the this class and set the two values for the new test.
+ AutoLockTest.setCheckerAddress(mCheckerCenterAddress, mCheckerRadiusAddress);
+
+ // Construct all base case test scenearios for the Auto Lock test.
+ // Detailed documentation on each test can be found in native code.
+ AutoLockTest autoLockTest = AutoLockTest.getSingletonTest();
+ autoLockTest.setActivity(CameraAnalyzerActivity.this);
+
+ mCurrentTest = autoLockTest;
+ initializeAdapter();
+
+ }
+ };
+
+ // Creates a list listner that launches the experiment with the user's click
+ private AdapterView.OnItemClickListener mListListener = new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ Log.v(TAG, String.format("Item %d selected!", position));
+ if (!mTestInProgress) {
+ DebugOutputProcessingTask captureTask = new DebugOutputProcessingTask();
+ disableAll();
+ captureTask.execute(position);
}
- mProcessingPicture = false;
}
};
private SurfaceHolder.Callback mSurfaceChangeListener =
new SurfaceHolder.Callback() {
+
+ // Sets the aspect ratio of the camera preview to 4:3
@Override
public void surfaceChanged(SurfaceHolder holder,
int format,
int width,
int height) {
+ int x = mCameraView.getWidth();
+ int y = mCameraView.getHeight();
+ Log.v(TAG, String.format("Measures are %d, %d", x, y));
- }
+ if ( x > 4.0 / 3.0 * y) {
+ android.view.ViewGroup.LayoutParams lp = mCameraView.getLayoutParams();
+ lp.height = y;
+ lp.width = (int)(4.0 / 3.0 * lp.height);
+ Log.v(TAG, String.format("params are %d, %d", lp.width, lp.height));
+ mCameraView.setLayoutParams(lp);
+ }
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
try {
mCamera.setPreviewDisplay(mCameraView.getHolder());
} catch (IOException e) {
throw new RuntimeException("Unable to connect camera to display: " + e);
}
+ CameraTests.setCameraView(mCameraView);
mCamera.startPreview();
}
@Override
- public void surfaceDestroyed(SurfaceHolder holder) {
+ public void surfaceCreated(SurfaceHolder holder) {}
+ @Override
+ public void surfaceDestroyed(SurfaceHolder holder) {}
+ };
+
+ @Override
+ public String getTestDetails() {
+ return mResultReport;
+ }
+
+ class TwoColumnAdapter extends ArrayAdapter<String> {
+ TwoColumnAdapter(Context context) {
+ super(context, R.layout.ca_row);
}
- };
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ LayoutInflater inflater = getLayoutInflater();
+ View row = inflater.inflate(R.layout.ca_row, parent, false);
+ TextView nameField = (TextView) row.findViewById(R.id.caTestName);
+ TextView resultField = (TextView) row.findViewById(R.id.caTestResult);
+ if (mCurrentTest != null) {
+ nameField.setText(mCurrentTest.getTestName(position));
+ resultField.setText(mCurrentTest.getResult(position));
+ }
+ return row;
+ }
+ }
+
+ private void initializeAdapter() {
+ mAdapter.clear();
+ if (mCurrentTest != null) {
+ for (int i = 0; i < mCurrentTest.getNumTests(); ++i) {
+ mAdapter.add(mCurrentTest.getTestName(i));
+ }
+ }
+ }
+
+ public int getCameraIdx() {
+ return mCameraIdx;
+ }
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraTests.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraTests.java
new file mode 100644
index 0000000..7cea762
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/CameraTests.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.camera.analyzer;
+
+import android.graphics.Bitmap;
+import android.hardware.Camera;
+import android.os.Environment;
+import android.util.Log;
+import android.view.SurfaceView;
+
+import java.io.FileOutputStream;
+import java.io.File;
+import java.lang.Runnable;
+
+/**
+ * Provides an abstraction for all camera tests and allows communication
+ * between camera test classes with the UI thread. This base class provides
+ * functions to contruct and access debug output images. It can access and
+ * set the pointer address of checkerboard centers and radius. It also provides
+ * native methods to convert an image shot by the camera into a native
+ * character array. Another native method it provides is to create a native
+ * test handler with desired debug height and width.
+ */
+public abstract class CameraTests{
+
+ private static final String TAG = "CameraTests";
+
+ /** Memory address of the color checker centers. */
+ private static long sCheckerCenterAddress = 0;
+ /** Memory address of the color checker radius. */
+ private static long sCheckerRadiusAddress = 0;
+ /** The surface view linked with the camera preview. */
+ private static SurfaceView sCameraView;
+ /** Image debug output. */
+ private Bitmap mDebugOutput;
+ /** Shared camera instance. */
+ protected static Camera mTestCamera = null;
+
+ /**
+ * Constructs the base CameraTests class.
+ */
+ public CameraTests() {}
+
+ /**
+ * Returns debug Bitmap image. In the test to find the color checker,
+ * the debug image will be the captured image with a matched color checker
+ * overlay on top. In the exposure compensation test, the debug image
+ * will be the response curve of the camera.
+ * @return A low-resolution Bitmap to be displayed in the UI.
+ */
+ public Bitmap getDebugOutput() {
+ return mDebugOutput;
+ }
+
+ public String getDebugText() {
+ return "";
+ }
+
+ public abstract String getTestName();
+
+ /**
+ * Gets the detailed report for CTS output.
+ */
+ public String getResultText(){
+ return "Details not available \n";
+ }
+
+ /**
+ * Provides a polymorphism to start the run() method for all child classes.
+ */
+ public abstract void run(int index);
+
+ public SurfaceView getCameraView() {
+ return sCameraView;
+ }
+
+ public static void setCameraView(SurfaceView cameraView) {
+ sCameraView = cameraView;
+ }
+
+ /**
+ * Refreshes the camera instance when the activity opens a new camera.
+ */
+ public static void setCamera(Camera newCamera) {
+ mTestCamera = newCamera;
+ }
+
+ public static Camera getCamera() {
+ return mTestCamera;
+ }
+
+ /**
+ * Sets the memory address of the checker centers and checker radius.
+ *
+ * @param inputCenterAddress the new memory address of
+ * the color checker centers
+ * @param inputRadiusAddress the new memory address of
+ * the color checker radius
+ */
+ public static void setCheckerAddress(long inputCenterAddress, long inputRadiusAddress) {
+ sCheckerCenterAddress = inputCenterAddress;
+ sCheckerRadiusAddress = inputRadiusAddress;
+ }
+
+ /**
+ * Provides polymorphism to indicate whether the checker memory addresses
+ * should be copied.
+ *
+ * @return <code>true</code> if the class invoking the method needs to
+ * update the memory address of the color checker
+ * centers and radius;
+ * <code>false</code> if the class invoking the method does NOT
+ * update the memory address of the color checker
+ * centers and radius.
+ */
+ public boolean copyCheckerAddress() {
+ return false;
+ }
+
+ public void cleanUp() {
+ }
+
+ public static long getCheckerCenter() {
+ return sCheckerCenterAddress;
+ }
+
+ public static long getCheckerRadius() {
+ return sCheckerRadiusAddress;
+ }
+
+ public abstract String getTestName(int index);
+
+ public abstract String getResult(int index);
+
+ public abstract int getNumTests();
+
+ /**
+ * Provides a native method to convert the input Bitmap of the captured
+ * image into a native character array and constructs a native image class
+ * with this character array. This method currently supports conversion
+ * of Bitmaps in the formats of RGB_565 and RGB_8888.
+ *
+ * @param input the input Bitmap, which is decoded from the camrea data.
+ *
+ * @return the memory address of the native image class which contains
+ * the character array.
+ */
+ public native long findNative(Bitmap input);
+
+ /**
+ * Provides a native method to create a native image handler class. The
+ * native image handler class is the base class for all test classes and
+ * contains the debug output as a character array.
+ *
+ * @param outputHeight the desired height for the debug output
+ * @param outputWidth the desired width for the debug output
+ *
+ * @return the memory address of the native test handler class.
+ */
+ public native long createImageTestHandler(int outputHeight, int outputWidth);
+
+ /**
+ * Provides a native method to clean up the memory taken by the handler.
+ *
+ * @param handlerAddress the memory address of the native test handler,
+ * which contains the debug output.
+ */
+ public native void cleanUpHandler(long handlerAddress);
+
+ /**
+ * Provides a native method to convert the native debug output from
+ * character array back to Bitmap and copy it to the debug output of this
+ * class.
+ *
+ * @param handlerAddress the memory address of the native test handler,
+ * which contains the debug output.
+ */
+ public native void displayHandlerDebugOutput(long handlerAddress);
+
+ static {
+ System.loadLibrary("cameraanalyzer");
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ColorChecker.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ColorChecker.java
deleted file mode 100644
index c9df24a..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ColorChecker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.cts.verifier.camera.analyzer;
-
-import android.graphics.Bitmap;
-
-/** The ColorChecker class is used to locate a Xrite Classic Color Checker grid
- * pattern in an image, and return the average value of each color patch.
- *
- * The pattern is a 6x4 grid of square color patches. The detection routine
- * assumes the pattern is placed roughly facing the camera, with the long size
- * roughly horizontal. It doesn't matter whether the pattern is upside down or
- * not - the returned array will have the grayscale squares of the pattern on
- * the bottom row.
- */
-class ColorChecker {
-
- private float[] mPatchValues;
- private Bitmap mDebugOutput;
- private boolean mSuccess = false;
-
- /** Construct a ColorChecker from a source Bitmap.
- *
- * @param source The source image to scan through for the 6x4 Xrite Classic
- * Color Checker pattern.
- */
- public ColorChecker(Bitmap source) {
- mPatchValues = new float[6 * 4 * 3];
- mSuccess = findNative(source);
- }
-
- /** Returns whether the ColorChecker pattern was found in the source bitmap
- *
- * @return true if the pattern was found in the source Bitmap. false
- * otherwise.
- */
- public boolean isValid() {
- return mSuccess;
- }
-
- /** Returns patch RGB triplet for patch (x, y), or null if the pattern wasn't
- * found.
- *
- * @param x Column of the patch
- * @param y Row of the patch
- * @return A 3-entry float array representing the R, G, and B values of the
- * patch in roughly linear luminance, mapped to the 0-1 range.
- */
- public float[] getPatchRGB(int x, int y) {
- if (!mSuccess) throw new RuntimeException("No color checker found!");
- float[] rgb = {
- mPatchValues[(y * 6 + x) * 3 + 0],
- mPatchValues[(y * 6 + x) * 3 + 1],
- mPatchValues[(y * 6 + x) * 3 + 2]
- };
- return rgb;
- }
-
- /** Returns patch (x, y) color channel c.
- *
- * @param x Column of the patch
- * @param y Row of the patch
- * @param c Color channel of the patch (0 = R, 1 = G, 2 = B)
- * @return The float value for that color channel in roughly linear
- * luminance, mapped to the 0-1 range.
- */
- public float getPatchValue(int x, int y, int c) {
- if (!mSuccess) throw new RuntimeException("No color checker found!");
- return mPatchValues[(y * 6 + x) * 3 + c];
- }
-
- /** Returns debug Bitmap image showing detected candidate patches and the
- * grid if it was found. Valid even if the pattern wasn't found. Candiate
- * patches will have red bounding boxes. In addition, patches that are part
- * of the color checker pattern are have a green diagonal, and all their
- * member pixels are colored in solid blue.
- *
- * @return A low-resolution version of the source Bitmap with overlaid
- * detection results.
- */
- public Bitmap getDebugOutput() {
- return mDebugOutput;
- }
-
- native boolean findNative(Bitmap input);
-
- static {
- System.loadLibrary("cameraanalyzer");
- }
-}
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ColorCheckerTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ColorCheckerTest.java
new file mode 100644
index 0000000..dd2a966
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ColorCheckerTest.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.camera.analyzer;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.hardware.Camera;
+import android.util.Log;
+import android.widget.ImageView;
+
+import java.util.List;
+
+/** Locates a Xrite Classic Color Checker grid pattern in an image, stores the
+ * center positions and the color checker radius, and provides a function to
+ * get the memory address of these two properties.
+ *
+ * The pattern is a 6x4 grid of square color patches. The detection routine
+ * assumes the pattern is placed roughly facing the camera, with the long size
+ * roughly horizontal. It also assumes that the grey squares are in the bottom
+ * row.
+ */
+public class ColorCheckerTest extends CameraTests {
+
+ private static final String TAG = "ColorCheckerTest";
+
+ /** Memory address of the image class instance that contains the image. */
+ private long mClassAddress;
+ /** Memory address of the image test class instance. */
+ private long mTestHandler;
+ /** Thread lock. */
+ private final Object mProcessingImage = new Object();
+ /** Boolean to tell whether auto focus has succeded.*/
+ private boolean mAutoFocusSuccess;
+ /** Boolean to tell whether auto focus is supported.*/
+ private boolean mAutoFocusEnabled = false;
+ /** Singleton instance of the class.*/
+ private static ColorCheckerTest singletonTest = null;
+
+ private boolean mFindCheckerSuccess = false;
+
+ /**
+ * Constructs a <code>ColorCheckerTest</code> instance with a given
+ * Camera pointer.
+ */
+ private ColorCheckerTest() {
+ super();
+ }
+
+ /**
+ * Updates the camera and parameter when the activity switches camera.
+ */
+ public void updateCamera() {
+ Camera.Parameters params = mTestCamera.getParameters();
+ List<String> supportedFocusModes = params.getSupportedFocusModes();
+
+ // Sets camera focus mode to Auto focus if it is supported.
+ if (supportedFocusModes.contains(params.FOCUS_MODE_AUTO)) {
+ Log.v(TAG, "Auto focus possible");
+ params.setFocusMode(params.FOCUS_MODE_AUTO);
+ mTestCamera.setParameters(params);
+ mAutoFocusEnabled = true;
+ } else {
+ mAutoFocusEnabled = false;
+ }
+ }
+
+ public static synchronized ColorCheckerTest getSingletonTest() {
+ if (singletonTest == null) {
+ Log.v(TAG, "Creating a new ColorCheckerTest instance");
+ singletonTest = new ColorCheckerTest();
+ singletonTest.initializeTest();
+ }
+ return singletonTest;
+ }
+
+ private void initializeTest() {
+ // Creates a native test handler with a 120x160 pixel debug output
+ mTestHandler = createColorCheckerTest(120, 160);
+ }
+
+ @Override
+ public synchronized void run(int index) {
+ Log.v(TAG, "ColorCheckerTest thread started!");
+ mAutoFocusSuccess = false;
+ mFindCheckerSuccess = false;
+ // Sets camera focus mode to Auto focus if it is supported.
+ if (mAutoFocusEnabled) {
+ while (!mAutoFocusSuccess) {
+ // Starts the auto focus process of the camera.
+ mTestCamera.autoFocus(mAutoFocusListener);
+
+ // Locks thread until the camera finishes taking picture.
+ synchronized (mProcessingImage) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+ mProcessingImage.wait();
+ } catch (InterruptedException e) {
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+ } else {
+ mTestCamera.takePicture(null, null, null, mTestJpegListener);
+ synchronized (mProcessingImage) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+ mProcessingImage.wait();
+ } catch (InterruptedException e) {
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+
+ // Launches the native method to find the color checker in the image.
+ mFindCheckerSuccess = processColorCheckerTest(mTestHandler);
+ // Displays the debug output from the native test handler instance.
+ displayHandlerDebugOutput(mTestHandler);
+
+ Log.v(TAG, "Callback has returned!");
+ }
+
+ private Camera.AutoFocusCallback mAutoFocusListener = new Camera.AutoFocusCallback() {
+ public void onAutoFocus(boolean mSuccess, Camera mCamera) {
+ if (mSuccess) {
+ mAutoFocusSuccess = true;
+ Log.v(TAG, "Autofocus success!");
+ mCamera.takePicture(null, null, null, mTestJpegListener);
+ } else {
+ try{
+ Log.v(TAG, "Autofocus failed. Please adjust!");
+ Thread.sleep(4000);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){}
+
+ synchronized (mProcessingImage) {
+ mProcessingImage.notifyAll();
+ }
+ }
+ }
+ };
+
+ private Camera.PictureCallback mTestJpegListener = new Camera.PictureCallback() {
+ public void onPictureTaken(byte[] data, Camera mCamera) {
+ Log.v(TAG, "Shutter pressed down!");
+
+ // Changes the focus mode to fixed to avoid focus shift after
+ // auto focus is successful.
+ //Camera.Parameters params = mCamera.getParameters();
+ //params.setFocusMode(params.FOCUS_MODE_FIXED);
+ //mCamera.setParameters(params);
+
+ // Decodes the camera data to Bitmap and creates a native image
+ // class with the Bitmap.
+ Bitmap inputImage;
+ inputImage = BitmapFactory.decodeByteArray(data, 0, data.length);
+ long bufferAddress = findNative(inputImage);
+ Log.v(TAG, "findNative method finishes");
+
+ // Cleans up the Bitmap memory space.
+ inputImage.recycle();
+ data = null;
+ inputImage = null;
+ System.gc();
+
+ // Constructs a test handler class to handle the image.
+ createColorCheckerClass(bufferAddress, mTestHandler);
+
+ mCamera.startPreview();
+
+ // Notifies the thread lock the image capture is done.
+ synchronized (mProcessingImage) {
+ mProcessingImage.notifyAll();
+ }
+ }
+ };
+
+ /**
+ * Overrides the base class method and use the memory addresses of the
+ * checker centers and radius computed by the native test handler class
+ * to update the values stored in the base class.
+ *
+ * @return <code>true</code> indicating a memory address upload is needed.
+ */
+ @Override
+ public boolean copyCheckerAddress() {
+ if (mFindCheckerSuccess) {
+ setCheckerAddress(getColorCheckerCenterAdd(mTestHandler),
+ getColorCheckerRadiusAdd(mTestHandler));
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public void cleanUp() {
+ cleanUpHandler(mTestHandler);
+ }
+
+ @Override
+ public String getTestName() {
+ return "Color Checker test: \n";
+ }
+
+ @Override
+ public String getTestName(int index) {
+ return "Find color checker";
+ }
+
+ @Override
+ public String getResult(int index) {
+ if (mFindCheckerSuccess) {
+ return "Passed";
+ } else {
+ return "Failed";
+ }
+ }
+
+ @Override
+ public int getNumTests() {
+ return 1;
+ }
+
+ /**
+ * Gets the memory address of the vector storing the color checker centers
+ * from the native test handler instance.
+ *
+ * @param handlerAddress the memory address of the native test handler
+ * instance
+ *
+ * @return memory address of the native vector storing the color checker
+ * centers' coordinates
+ */
+ private native long getColorCheckerRadiusAdd(long handlerAddress);
+
+ /**
+ * Gets the memory address of the vector storing the color checker radius
+ * from the native test handler instance.
+ *
+ * @param handlerAddress the memory address of the native test handler
+ * instance.
+ *
+ * @return memory address of the native vector storing the color checker
+ * centers' coordinates
+ */
+ private native long getColorCheckerCenterAdd(long handlerAddress);
+
+ /**
+ * Creates a native color checker test handler instance.
+ *
+ * @param outputWidth the desired width for the debug output
+ * @param outputHeight the desired height of the debug output
+ *
+ * @return memory address of the native test handler instance
+ */
+ private native long createColorCheckerTest(int outputWidth, int outputHeight);
+
+ /**
+ * Loads a native image class instances and extracts data from it to add
+ * to the test handler.
+ *
+ * @param bufferAddress the memory address of the image class instance
+ * @param handlerAddress the memory address of the test handler instance
+ */
+ private native void createColorCheckerClass(long bufferAddress, long handlerAddress);
+
+ /**
+ * Processes the data in the native test handler instance. Computes test
+ * results with all the data and construct a debug image or debug text
+ * outputs.
+ *
+ * @param handlerAddress the memory address of the test handler instance
+ */
+ private native boolean processColorCheckerTest(long handlerAddress);
+
+ static {
+ System.loadLibrary("cameraanalyzer");
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ExposureCompensationTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ExposureCompensationTest.java
new file mode 100644
index 0000000..d9da4b6
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/ExposureCompensationTest.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.camera.analyzer;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.hardware.Camera;
+import android.util.Log;
+import android.widget.ImageView;
+
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Random;
+
+public class ExposureCompensationTest extends CameraTests {
+
+ private static final String TAG = "ExposureCompensationTest";
+
+ /** Records the current exposure level. */
+ private float mExposureLevel;
+ /** Lock for the camera object.*/
+ private final Object mProcessingImage = new Object();
+ /** Lock for the camera's auto focusing task.*/
+ private final Object mAutoFocusing = new Object();
+ /** Memory address of the native test handler.*/
+ private long mTestHandler;
+ /** Test results. */
+ private String[] mTestResults;
+ /** Number of sub-tests. */
+ private int mNumTests;
+ /** Camera Parameters. */
+ private Camera.Parameters mParams;
+ /** Debug results in text. */
+ private String mDebugText;
+
+ private static ExposureCompensationTest singletonTest = null;
+
+ private ExposureCompensationTest(){
+ super();
+ }
+
+ /** Prepares the camera and the related parameters for the test.*/
+ public void updateCamera() {
+ mParams = mTestCamera.getParameters();
+ Log.v(TAG, String.format("Exposure level is from %d to %d",
+ mParams.getMinExposureCompensation(),
+ mParams.getMaxExposureCompensation()));
+ mNumTests = (int) ((float) (mParams.getMaxExposureCompensation() -
+ mParams.getMinExposureCompensation())
+ * mParams.getExposureCompensationStep());
+ mTestResults = new String[mNumTests + 1];
+ for (int i = 0; i < mNumTests + 1; ++i) {
+ mTestResults[i] = "...";
+ }
+ }
+
+ public static synchronized ExposureCompensationTest getSingletonTest() {
+ if (singletonTest == null) {
+ Log.v(TAG, "Creating a new ExposureCompensationTest instance");
+ singletonTest = new ExposureCompensationTest();
+ singletonTest.initializeTest();
+ }
+ return singletonTest;
+ }
+
+ private void initializeTest() {
+ mDebugText = new String();
+ // Creates a native test handler with a 120x160 pixel debug output
+ mTestHandler = createExposureCompensationTest(200, 280);
+ }
+
+ @Override
+ public synchronized void run(int index){
+ Log.v(TAG, "ExposureCompensationTest thread started!");
+
+ int testRangeMin, testRangeMax;
+ if (index == 0) {
+ testRangeMin = mParams.getMinExposureCompensation();
+ testRangeMax = mParams.getMaxExposureCompensation();
+ } else {
+ testRangeMin = (int) ((float)(index - 1) / mParams.getExposureCompensationStep())
+ + mParams.getMinExposureCompensation();
+ testRangeMax = (int) ((float)(index) / mParams.getExposureCompensationStep())
+ + mParams.getMinExposureCompensation();
+ }
+
+ /** Checks for each exposure compensation setting within the test range.*/
+ for (int i = testRangeMin;
+ i <= testRangeMax; i += 1){
+ mExposureLevel = i * mParams.getExposureCompensationStep();
+ Log.v(TAG, String.format("Current exposure level is %d", i));
+ int mCameraExposure;
+
+ do{
+ mParams.setExposureCompensation(i);
+ mTestCamera.setParameters(mParams);
+
+ try{
+ Log.v(TAG, "Waiting");
+ Thread.sleep(4000);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e){
+ //TODO: error handling.
+ }
+
+ mParams = mTestCamera.getParameters();
+ mCameraExposure = mParams.getExposureCompensation();
+ Log.v(TAG, String.format("Camera exposure level is %d", mCameraExposure));
+ } while (mCameraExposure != i);
+
+ mTestCamera.takePicture(null, null, null, mTestJpegListener);
+
+ synchronized (mProcessingImage) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+ mProcessingImage.wait();
+ } catch (InterruptedException e){
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+
+ mDebugText = processExposureCompensationTest(mTestHandler);
+ displayHandlerDebugOutput(mTestHandler);
+
+ Log.v(TAG, "Callback has returned!");
+ mParams.setExposureCompensation(0);
+ mTestCamera.setParameters(mParams);
+ }
+
+ private Camera.PictureCallback mTestJpegListener = new Camera.PictureCallback() {
+ public void onPictureTaken(byte[] data, Camera mCamera) {
+ Log.v(TAG, "Shutter pressed down!");
+ Log.v(TAG, String.format("Current exposure is %f", mExposureLevel));
+
+ Bitmap inputImage;
+
+ inputImage = BitmapFactory.decodeByteArray(data, 0, data.length);
+ long bufferAddress = findNative(inputImage);
+ Log.v(TAG, "findNative method finishes");
+
+ inputImage.recycle();
+ data = null;
+ inputImage = null;
+ System.gc();
+
+ createExposureCompensationClass(bufferAddress, mTestHandler,
+ getCheckerCenter(), getCheckerRadius(),
+ mExposureLevel);
+ mCamera.startPreview();
+
+ synchronized (mProcessingImage) {
+ mProcessingImage.notifyAll();
+ }
+ }
+ };
+
+ @Override
+ public String getTestName(int index) {
+ switch (index) {
+ case 0:
+ return "EC All Range";
+ default:
+ return String.format("EC %d -> %d", (index - mNumTests / 2 - 1) * 10,
+ (index - mNumTests / 2) * 10);
+ }
+ }
+
+ @Override
+ public String getResult(int index) {
+ return mTestResults[index];
+ }
+
+ @Override
+ public int getNumTests() {
+ return mNumTests + 1;
+ }
+
+ @Override
+ public String getTestName() {
+ return "Exposure Compensation Test: \n";
+ }
+
+ @Override
+ public String getDebugText() {
+ return mDebugText;
+ }
+
+ private native long createExposureCompensationTest(int outputHeight, int outputWidth);
+
+ private native void createExposureCompensationClass(long bufferAddress, long handlerAddress,
+ long checkerCenterAddress, long checkerAadiusAddress, float mExposureLevel);
+
+ private native String processExposureCompensationTest(long handlerAddress);
+
+ static {
+ System.loadLibrary("cameraanalyzer");
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/MeteringTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/MeteringTest.java
new file mode 100644
index 0000000..ff5067a
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/MeteringTest.java
@@ -0,0 +1,685 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.camera.analyzer;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.hardware.Camera;
+import android.hardware.Camera.Area;
+import android.util.Log;
+import android.widget.ImageView;
+
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Implements a test to verify whether the camera metering system works as
+ * described in the API.
+ *
+ * The test consists two sub-categories. The first one has tests with only
+ * one metering area defined. The second one has tests with two metering areas
+ * defined. For each single sub-test, we use a random number generator to
+ * decide where to put some of the metering areas to and how much weight should
+ * be assigned to each area. For different tests, we use different ways to
+ * define other metering areas and their weight, in order to cover all possible
+ * fail cases. The metering areas are contrained to the grey squares in the
+ * bottom of the color checker.
+ */
+public class MeteringTest extends CameraTests {
+
+ private static final String TAG = "MeteringTest";
+
+ /** A long wait.*/
+ private static final int LONG_SLEEP = 4000;
+ /** Debug result in text. */
+ private String mDebugText;
+ /** Thread lock. */
+ private final Object mProcessingImage = new Object();
+ /** Memory address of the native test handler. */
+ private long mTestHandler;
+ /** The maximum number of metering area the device supports. */
+ private int mMaxNumMeteringArea;
+ /** The metering areas. */
+ private List<Camera.Area> mGreyAreas;
+ /** The coordinates of the grey squares on the color checker. */
+ private int[] mGreyCoordinates = new int[24];
+ /** Random number generator. */
+ private final Random mRandomGenerator = new Random();
+ /** Reference comparison result for tests. */
+ private ArrayList<Boolean> mReferenceCompareResults;
+ /** Number of tests in the same instance. */
+ private int mTestCount;
+ /** Reference test logs. */
+ private ArrayList<String> mReferenceLogs;
+ /** Test result to show. */
+ private String[] mTestResults;
+ /** Number of tests. */
+ private int mNumTests;
+ /** Camera Parameters. */
+ private Camera.Parameters mParams;
+ /** Singleton test instance. */
+ private static MeteringTest singletonTest = null;
+
+ /** Constructs a <code>MeteringTest</code> instance with the given
+ * camera pointer.
+ */
+ private MeteringTest() {
+ super();
+ }
+
+ public void updateCamera() {
+ // Looks up how many metering area the device supports.
+ mParams = mTestCamera.getParameters();
+ mMaxNumMeteringArea = mParams.getMaxNumMeteringAreas();
+ Log.v(TAG, String.format("Maximum number if metering area is %d", mMaxNumMeteringArea));
+ if (mMaxNumMeteringArea == 0) {
+ mDebugText = "Custom Metering not supported!";
+ Log.v(TAG, "Custom Metering not supported");
+ }
+ }
+
+ public static synchronized MeteringTest getSingletonTest() {
+ if (singletonTest == null) {
+ Log.v(TAG, "Creating a new MeteringTest instance");
+ singletonTest = new MeteringTest();
+ singletonTest.initializeTest();
+ }
+ return singletonTest;
+ }
+
+ private void initializeTest() {
+ // Creates a native metering test handler.
+ mTestHandler = createMeteringTest();
+ mDebugText = new String();
+ mReferenceCompareResults = new ArrayList<Boolean>();
+ mReferenceLogs = new ArrayList<String>();
+ mNumTests = 3;
+ mTestResults = new String[mNumTests];
+ for (int i = 0; i < mNumTests; ++i) {
+ mTestResults[i] = "...";
+ }
+ }
+
+ /**
+ * Runs the metering test instance.
+ */
+ @Override
+ public synchronized void run(int index) {
+ if (index == 0) {
+ run(1);
+ run(2);
+ return;
+ }
+ Log.v(TAG, "MeteringTest thread started!");
+
+ // Finds the coordinates of the grey squares on the color checker.
+ // The coordinate system has (-1000, -1000) on the upper left corner.
+ // And (1000, 1000) on the bottom right corner.
+ findGreyCoordinates(mGreyCoordinates, getCheckerCenter(), getCheckerRadius());
+
+ if (mMaxNumMeteringArea > 0) {
+ mTestCount = 0;
+ // Runs the metering tests category by category.
+ switch (index) {
+ case 1:
+ runOneAreaTest();
+ break;
+ case 2:
+ if (mMaxNumMeteringArea > 1) {
+ runTwoAreasTest();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ mParams = mTestCamera.getParameters();
+ mParams.setMeteringAreas(null);
+ mTestCamera.setParameters(mParams);
+
+ boolean[] testCompareResults = new boolean[2 * mTestCount];
+
+ // Processes the image data taken so far and stores the test results.
+ processMeteringTest(mTestHandler, testCompareResults);
+ // Prepares debug output based on the test results.
+ prepareDebugText(testCompareResults, index);
+
+ mReferenceCompareResults.clear();
+ mReferenceLogs.clear();
+ }
+
+ /**
+ * Prepares the test results in HTML text string to show in the UI.
+ *
+ * If the test result is the same as the reference result, the text will be
+ * shown in green. Otherwise it would be shown as red.
+ *
+ * @param testCompareResults the array storing the comparison results from
+ * the data taken by the camera so far.
+ */
+ private void prepareDebugText(boolean[] testCompareResults, int index) {
+ mDebugText = "";
+ boolean groupTestPassed = true;
+ for (int i = 0; i < mTestCount; ++i) {
+ String testLog;
+ boolean testPassed = true;
+ testLog = mReferenceLogs.get(i);
+ mDebugText += (testLog + "<br/>");
+
+ if (testCompareResults[i * 2] == mReferenceCompareResults.get(i * 2)) {
+ mDebugText += String.format(
+ "Picture 1 equivalent to Picture 2 is %b \n",
+ testCompareResults[i * 2]);
+ } else {
+ mDebugText += String.format(
+ "Picture 1 equivalent to Picture 2 is %b \n",
+ testCompareResults[i * 2]);
+ testPassed = false;
+ }
+
+ if (testCompareResults[i * 2 + 1] == mReferenceCompareResults.get(i * 2 + 1)) {
+ mDebugText += String.format(
+ "Picture 1 darker than Picture 2 is %b \n",
+ testCompareResults[i * 2 + 1]);
+ } else {
+ mDebugText += String.format(
+ "Picture 1 darker than Picture 2 is %b \n",
+ testCompareResults[i * 2 + 1]);
+ testPassed = false;
+ }
+
+ if (testPassed) {
+ mDebugText += "Test passed! \n";
+ } else {
+ mDebugText += "Test failed! \n";
+ groupTestPassed = false;
+ }
+ Log.v(TAG, String.format("%s", mDebugText));
+ }
+
+ if (groupTestPassed) {
+ mTestResults[index] = "Passed";
+ } else {
+ mTestResults[index] = "Failed";
+ }
+
+ }
+
+ /**
+ * Runs tests to check whether the metering functionalities work properly
+ * when one metering area is added.
+ */
+ private void runOneAreaTest() {
+ int weight1;
+ int weight2;
+ int square1;
+ int square2;
+
+ Log.v(TAG, "Running one area Test");
+
+ // Test case 1: Two images have the same metering area. Image 1 has
+ // a diffent weight than Image 2. The result images should be
+ // identical.
+ // Tests whether weight normalization works.
+ square1 = mRandomGenerator.nextInt(6);
+ weight1 = mRandomGenerator.nextInt(100) + 1;
+ runSingleTest(square1, square1, weight1);
+
+ square2 = square1;
+ weight2 = mRandomGenerator.nextInt(100) + 901;
+ runSingleTest(square2, square2, weight2);
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ Log.v(TAG, String.format("Running test for %d square with weights %d, %d",
+ square1, weight1, weight2));
+ mReferenceLogs.add(String.format(
+ "Running test for %d 1x1 square with weights %d, %d", square1, weight1, weight2));
+ ++mTestCount;
+
+ // Test case 2: Two images have different metering areas. Image 1 has
+ // one of the grey squares as its metering area. Image 2 has a darker
+ // grey square as its metering area. The weights for both images are
+ // the same. Image 1 is expected to be darker than Image 2.
+ // Tests whether metering on uni-brightness patches work.
+ square1 = mRandomGenerator.nextInt(5);
+ weight1 = mRandomGenerator.nextInt(1000) + 1;
+ runSingleTest(square1, square1, weight1);
+
+ square2 = mRandomGenerator.nextInt(6 - square1 - 1) + square1 + 1;
+ weight2 = weight1;
+ runSingleTest(square2, square2, weight2);
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add(String.format(
+ "Running test for %d, %d 1x1 square with weight %d", square1, square2, weight1));
+ ++mTestCount;
+
+ // Test case 3: Two images have different metering areas. Image one has
+ // one of the grey squares as its metering area. Image 2 has a
+ // rectangle which contains Image 1's metering area and the neighboring
+ // darker grey square. The weights for both tests are the same. Image 1
+ // is expected to be darker than Image 2.
+ // Tests whether metering on patches with different brightness works.
+ square1 = mRandomGenerator.nextInt(5);
+ weight1 = mRandomGenerator.nextInt(1000) + 1;
+ runSingleTest(square1, square1, weight1);
+
+ square2 = square1;
+ weight2 = weight1;
+ runSingleTest(square2, square2 + 1, weight2);
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add(String.format(
+ "Running test for %d 1x1, 1x2 square with weight %d", square1, weight1));
+ ++mTestCount;
+
+ // Test case 4: Two images have different metering areas. Image one has
+ // two neighboring grey squares as its metering area. Image 2 has two
+ // darker neighboring grey squares as its metering area. Weights are
+ // the same for both images. Image 1 is expected to be darker than
+ // Image 2.
+ // Tests whether metering on two mixed-brightness patches work.
+ square1 = mRandomGenerator.nextInt(4);
+ weight1 = mRandomGenerator.nextInt(1000) + 1;
+ runSingleTest(square1, square1 + 1, weight1);
+
+ square2 = mRandomGenerator.nextInt(5 - square1 - 1) + square1 + 1;
+ weight2 = weight1;
+ runSingleTest(square2, square2 + 1, weight2);
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add(String.format(
+ "Running test for %d, %d 1x2 square with weight %d", square1, square2, weight1));
+ ++mTestCount;
+
+ // Test case 5: Two images have different metering areas. Image one has
+ // three neighboring grey squares as its metering area. Image 2 has
+ // three darker neighboring grey squares as its metering area. Weights
+ // are the same. Image 1 is expected to be darker than Image 2.
+ // Tests whether metering on three mixed-brightness patches work.
+ square1 = mRandomGenerator.nextInt(3);
+ weight1 = mRandomGenerator.nextInt(1000) + 1;
+ runSingleTest(square1, square1 + 2, weight1);
+
+ square2 = mRandomGenerator.nextInt(4 - square1 - 1) + square1 + 1;
+ weight2 = weight1;
+ runSingleTest(square2, square2 + 2, weight2);
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add(String.format(
+ "Running test for %d, %d 1x3 square with weight %d", square1, square2, weight1));
+ ++mTestCount;
+ }
+
+ /**
+ * Runs metering tests to verify the functionalities when there are two
+ * areas set as the metering area.
+ */
+ private void runTwoAreasTest() {
+ int[] weight1 = new int[2];
+ int[] weight2 = new int[2];
+ int[] square1Start = new int[2];
+ int[] square2Start = new int[2];
+ int[] square1End = new int[2];
+ int[] square2End = new int[2];
+
+ Log.v(TAG, "Running two-area Test");
+
+ // Test case 1: Image 1 has two metering areas. They are two adjacent
+ // grey squares (each set as a metering area). The two areas have the
+ // same weight. Image 2 has one metering area, which is the combination
+ // of Image 1's two metering areas as a rectangle. The weight is the
+ // same as that of Image 1's individual area. Image 1 is expected to
+ // be equivalent to Image 2.
+ // Tests whether having seperating a metering area into two will yield
+ // the same result.
+ square1Start[0] = mRandomGenerator.nextInt(5);
+ square1End[0] = square1Start[0];
+ weight1[0] = mRandomGenerator.nextInt(1000) + 1;
+ square1Start[1] = square1Start[0] + 1;
+ square1End[1] = square1Start[1];
+ weight1[1] = weight1[0];
+ runMultipleAreaTest(square1Start, square1End, weight1);
+
+ square2Start[0] = square1Start[0];
+ weight2[0] = weight1[0];
+ runSingleTest(square2Start[0], square2Start[0] + 1, weight2[0]);
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add(String.format(
+ "Running test for %d, %d 1x1 square with weight %d",
+ square1Start[0], square1Start[1], weight1[0]));
+ ++mTestCount;
+
+ // Test case 2: Image 1 has two metering areas. They are two random
+ // grey squareson the color checker. The brighter square has a larger
+ // weight than the darker square. Image 2 has the same two metering
+ // areas as Image 1. The weights for both are equal to the weight of
+ // the darker square in Image 1, which is smaller than the weight of
+ // the brighter square in Image 1. Image 1 is expected to be darker
+ // than Image 2.
+ // Tests whether giving one of the two metering areas a different
+ // weight would change the image in the correct way.
+ square1Start[0] = mRandomGenerator.nextInt(4);
+ square1End[0] = square1Start[0];
+ weight1[0] = mRandomGenerator.nextInt(100) + 901;
+ square1Start[1] = mRandomGenerator.nextInt(5 - square1Start[0] - 1) + square1Start[0] + 1;
+ square1End[1] = square1Start[1];
+ weight1[1] = mRandomGenerator.nextInt(100) + 1;
+ runMultipleAreaTest(square1Start, square1End, weight1);
+
+ square2Start[0] = square1Start[0];
+ square2End[0] = square2Start[0];
+ weight2[0] = weight1[1];
+ square2Start[1] = square1Start[1];
+ square2End[1] = square1End[1];
+ weight2[1] = weight2[0];
+ runMultipleAreaTest(square2Start, square2End, weight2);
+ mReferenceCompareResults.add(false);
+ mReferenceCompareResults.add(true);
+ mReferenceLogs.add(String.format(
+ "Running test for %d, %d 1x1 square with weight %d, %d",
+ square1Start[0], square1Start[1], weight1[0], weight2[1]));
+ ++mTestCount;
+
+ // Test case 3: Image 1 has two metering areas. Both are set to the
+ // same random grey square on the color checker. The weight for both
+ // are the same. Image 2 has one meterig area, which is the same as
+ // Image 1's chosen grey square. The weight for it is the same as
+ // Image 1's weight for one metering area. Image 1 is expected to be
+ // equivalent to Image 2.
+ // Tests whether defining overlapping metering area works.
+ square1Start[0] = mRandomGenerator.nextInt(6);
+ square1End[0] = square1Start[0];
+ weight1[0] = mRandomGenerator.nextInt(1000) + 1;
+ square1Start[1] = square1Start[0];
+ square1End[1] = square1Start[1];
+ weight1[1] = weight1[0];
+ runMultipleAreaTest(square1Start, square1End, weight1);
+
+ square2Start[0] = square1Start[0];
+ square2End[0] = square2Start[0];
+ weight2[0] = weight1[0];
+ runSingleTest(square2Start[0], square2End[0], weight2[0]);
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add(String.format(
+ "Running test for %d 1x1 square with weight %d,", square1Start[0], weight1[0]));
+ ++mTestCount;
+
+ // Test case 4: Image 1 has two metering areas. The first one is a
+ // grey square on the color checker. The second one is a rectangle
+ // containing the first metering area's grey square and its neighboring
+ // darker square. The weights for both metering area are the same.
+ // Image 2 has two metering areas. The first one is the same grey
+ // square as Image 1's first metering area. The second one is the
+ // neighboring darker grey square. The weight for the brighter square
+ // is double the weight of Image 1's weights for each metering area.
+ // The weight for the Image 2's darker grey square is the same as
+ // Image 1's weight for each of its metering areas. Image 1 is expected
+ // to be equivalent to Image 2.
+ // Tests whether the weights for overlapping metering area add up.
+ square1Start[0] = mRandomGenerator.nextInt(2);
+ square1End[0] = square1Start[0];
+ weight1[0] = mRandomGenerator.nextInt(500) + 1;
+ square1Start[1] = square1Start[0];
+ square1End[1] = square1Start[1] + 1;
+ weight1[1] = weight1[0];
+ runMultipleAreaTest(square1Start, square1End, weight1);
+
+ square2Start[0] = square1Start[0];
+ square2End[0] = square1End[0];
+ weight2[0] = weight1[0] * 2;
+ square2Start[1] = square2Start[0] + 1;
+ square2End[1] = square2Start[1];
+ weight2[1] = weight1[1];
+ runMultipleAreaTest(square2Start, square2End, weight2);
+ mReferenceCompareResults.add(true);
+ mReferenceCompareResults.add(false);
+ mReferenceLogs.add(String.format(
+ "Running test for %d 1x2 1x1 and 1x2 square with weight %d,",
+ square1Start[0], weight1[0]));
+ ++mTestCount;
+ }
+
+ /**
+ * Runs the metering test when multiple metering areas are defined.
+ *
+ * @param startIndex the array storing the index of the grey square where
+ * one metering area starts
+ * @param endIndex the array storing the index of the grey square where one
+ * metering area ends.
+ * @param weight the array storing the weight for each metering area.
+ */
+ private void runMultipleAreaTest(int[] startIndex, int[] endIndex, int[] weight) {
+ int numAreas = startIndex.length;
+ mParams = mTestCamera.getParameters();
+ List<Camera.Area> meteringAreas = new ArrayList<Camera.Area>();
+
+ for (int i = 0; i < numAreas; ++i) {
+ meteringAreas.add(makeArea(startIndex[i], endIndex[i], weight[i]));
+ Log.v(TAG, String.format("Add metering area for %d, %d, %d",
+ startIndex[i], endIndex[i], weight[i]));
+ }
+ mParams.setMeteringAreas(meteringAreas);
+ mTestCamera.setParameters(mParams);
+ takePicture();
+ }
+
+ /**
+ * Runs the metering test when one metering area is defined.
+ *
+ * @param startIndex the index of the grey square where the metering area
+ * starts
+ * @param endIndex the index of the grey square where the metering area
+ * ends.
+ * @param weight the weight for the metering area.
+ */
+ private void runSingleTest(int startIndex, int endIndex, int weight) {
+ mParams = mTestCamera.getParameters();
+ List<Camera.Area> meteringAreas = new ArrayList<Camera.Area>();
+
+ Log.v(TAG, String.format("Single test for %d, %d, %d", startIndex, endIndex, weight));
+ meteringAreas.add(makeArea(startIndex, endIndex, weight));
+ mParams.setMeteringAreas(meteringAreas);
+ mTestCamera.setParameters(mParams);
+ takePicture();
+ }
+
+ /**
+ * Takes picture with the camera instance linked to this test class.
+ */
+ private void takePicture() {
+ // Waits for the metering to be stable
+ try{
+ Log.v(TAG, "Waiting for metering");
+ Thread.sleep(LONG_SLEEP);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e) {}
+
+ mTestCamera.takePicture(null, null, null, mTestJpegListener);
+
+ // Locks thread until picture is taken and ready for processing.
+ synchronized (mProcessingImage) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+
+ mProcessingImage.wait();
+ } catch (InterruptedException e) {
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+
+ /**
+ * Constructs a <code>Camera.Area</code> object of the metering area.
+ * Given the start and end index of one metering area, it takes the upper
+ * left corner of the starting square and the bottom right corner of the
+ * end square to construct an Area.
+ *
+ * @param startIndex the index of the grey square where the metering area
+ * starts
+ * @param endIndex the index of the grey square where the metering area
+ * ends
+ * @param weight the weight of this metering area.
+ *
+ * @return a <code>Camera.Area</code> object which represents this metering
+ * area
+ */
+ private Camera.Area makeArea(int startIndex, int endIndex, int weight) {
+ Rect areaRect = new Rect(mGreyCoordinates[startIndex * 4],
+ mGreyCoordinates[startIndex * 4 + 1],
+ mGreyCoordinates[endIndex * 4 + 2],
+ mGreyCoordinates[endIndex * 4 + 3]);
+ Camera.Area area = new Camera.Area(areaRect, weight);
+
+ return area;
+ }
+
+ @Override
+ public String getDebugText() {
+ return mDebugText;
+ }
+
+ @Override
+ public String getResultText() {
+ return mDebugText;
+ }
+
+ @Override
+ public String getTestName() {
+ return "Metering Test: \n";
+ }
+
+ @Override
+ public String getTestName(int index) {
+ switch (index) {
+ case 0:
+ return "Run all tests";
+ case 1:
+ return "One metering area tests";
+ case 2:
+ return "Multiple metering areas tests";
+ default:
+ return "";
+ }
+ }
+
+ @Override
+ public String getResult(int index) {
+ return mTestResults[index];
+ }
+
+ @Override
+ public int getNumTests() {
+ return mNumTests;
+ }
+
+ private Camera.PictureCallback mTestJpegListener = new Camera.PictureCallback() {
+ public void onPictureTaken(byte[] data, Camera mCamera) {
+ Log.v(TAG, "Shutter pressed down!");
+ Bitmap inputImage;
+ try {
+ FileOutputStream outStream = new FileOutputStream(
+ String.format("/sdcard/metering%d.jpg", System.currentTimeMillis()));
+ outStream.write(data);
+ outStream.close();
+ } catch (FileNotFoundException e) {
+ } catch (IOException e) {}
+
+ // Decodes the input data of the camera.
+ inputImage = BitmapFactory.decodeByteArray(data, 0, data.length);
+
+ // Records the memory address of the native image class instance.
+ long bufferAddress = findNative(inputImage);
+ Log.v(TAG, "findNative method finishes");
+
+ // Cleans up the memory taken by the bitmap.
+ inputImage.recycle();
+ data = null;
+ inputImage = null;
+ System.gc();
+
+ // Add the image data to the native test handler.
+ createMeteringClass(bufferAddress, mTestHandler,
+ getCheckerCenter(), getCheckerRadius());
+ mCamera.startPreview();
+
+ // Releases thread lock after the image is processed.
+ synchronized (mProcessingImage) {
+ mProcessingImage.notifyAll();
+ }
+ }
+ };
+
+ /**
+ * Finds the coordinates of the grey squares on the color checker.
+ * The coordinates are computed by using the checker center and radius.
+ * The coordinates are converted to a system with (-1000, -1000) in the
+ * upper left corner and (1000, 1000) in the bottom right corner.
+ *
+ * @param greyCoordinates the array to store the coordinates of the grey
+ * squares
+ * @param checkerCenterAddress the memory address pointing to the vector
+ * storing the color checker's centers.
+ * @param checkerRadiusAddress the memory address pointing to the vetor
+ * storing the color checker's radius.
+ */
+ private native void findGreyCoordinates(int[] greyCoordinates,
+ long checkerCenterAddress, long checkerRadiusAddress);
+
+ /**
+ * Creates the native metering test handler with no debug image.
+ *
+ * @return the memory address pointing to the native test handler instance
+ */
+ private native long createMeteringTest();
+
+ /**
+ * Adds the data from the native image class instance to the native test
+ * handler.
+ *
+ * @param bufferAddress the meory address of the native image class
+ * @param handlerAddress the memory address of the native test handler
+ * @param checkerCenterAddress the memory address of the checker cneters
+ * @param checkerRadiusAddress the meory address of the checker radius
+ */
+ private native void createMeteringClass(long bufferAddress, long handlerAddress,
+ long checkerCenterAddress,
+ long checkerRadiusAddress);
+
+ /**
+ * Process the data stored in the native test handler and stores the
+ * comparison results.
+ *
+ * @param handlerAddress the memory address of the native test handler
+ * @param testCompareResults the boolean array to store the test comparison
+ * results
+ */
+ private native void processMeteringTest(long handlerAddress, boolean[] testCompareResults);
+
+ static {
+ System.loadLibrary("cameraanalyzer");
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/WhiteBalanceTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/WhiteBalanceTest.java
new file mode 100644
index 0000000..f3bab86
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/analyzer/WhiteBalanceTest.java
@@ -0,0 +1,398 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.camera.analyzer;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.hardware.Camera;
+import android.util.Log;
+import android.widget.ImageView;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import java.util.List;
+
+/**
+ * Implements a test to verify whether the correlated color temperatures (CTT)
+ * of the supported white balance modes are inside the range camera
+ * manufacturers generally agree on.
+ *
+ * The test assumes that the Daylight white balance mode has a CCT of 5200K,
+ * which is widely agreed in industry and academics. It then use this as a
+ * benchmark and compare images taken with other white balance settings.
+ * Using the pixel values of the grey squares on the color checker, the CCT
+ * of other white balance modes can be computed. The reference ranges were
+ * summarized with the help of online resources. For the Auto mode, the
+ * reference CCT is computed as the CCT that will keep the grey squares appear
+ * grey in the result image.
+ */
+public class WhiteBalanceTest extends CameraTests {
+
+ private static final String TAG = "WhiteBalanceTest";
+
+ /** Current white balance mode. */
+ private String mWhiteBalance;
+ /** Array to store the reference CCT's of each mode. */
+ private int[][] mReferenceTemperature;
+ /** List of supported white balance mode on a device. */
+ private List<String> mWhiteBalanceList;
+ /** The index of the white balance mode "Auto". */
+ private int mAutoId;
+
+ /** Debug results in text. */
+ private String mDebugText;
+ /** Memory address of the native test handler instance. */
+ private long mTestHandler;
+ /** Thread lock. */
+ private final Object mProcessingImage = new Object();
+ /** Test result to show. */
+ private String[] mTestResults;
+ /** Number of test. */
+ private int mNumTests;
+ /** Camera Parameters. */
+ private Camera.Parameters mParams;
+ /** Singleton test instance. */
+ private static WhiteBalanceTest singletonTest = null;
+ /** Boolean to check whehter daylight wb has been recorded. */
+ private boolean mHasDaylight = false;
+
+ /**
+ * Constructs a <code>WhiteBalanceTest</code> instance with a given
+ * Camera pointer.
+ */
+ private WhiteBalanceTest() {
+ super();
+ }
+
+ public void updateCamera() {
+ mAutoId = 0;
+ mHasDaylight = false;
+ mParams = mTestCamera.getParameters();
+ mWhiteBalanceList = mParams.getSupportedWhiteBalance();
+ mNumTests = mWhiteBalanceList.size() + 1;
+ mTestResults = new String[mNumTests];
+ for (int i = 0; i < mNumTests; ++i) {
+ mTestResults[i] = "...";
+ }
+
+ if (mWhiteBalanceList != null) {
+ mReferenceTemperature = new int[mWhiteBalanceList.size()][2];
+
+ // Sets the reference CCT of the supported white balance modes
+ for (int i = 0; i < mWhiteBalanceList.size(); i++) {
+ setReferenceTemperature(i, mWhiteBalanceList.get(i));
+ if (mWhiteBalanceList.get(i).equals("auto")) {
+ mAutoId = i;
+ }
+ }
+ }
+ }
+
+ public static synchronized WhiteBalanceTest getSingletonTest() {
+ if (singletonTest == null) {
+ Log.v(TAG, "Creating a new WhiteBalanceTest instance");
+ singletonTest = new WhiteBalanceTest();
+ singletonTest.initializeTest();
+ }
+ return singletonTest;
+ }
+
+ private void initializeTest() {
+ mDebugText = new String();
+ // Creates a native white balance test handler.
+ // mTestHandler stores the memory address of this instance.
+ mTestHandler = createWhiteBalanceTest();
+ }
+
+ private void initializeWhiteBalanceTest() {
+ mWhiteBalance = "daylight";
+ takePicture(mWhiteBalance);
+ int colorTemperature = processWhiteBalanceTest(mTestHandler);
+
+ setReferenceTemperature(mAutoId, colorTemperature);
+ mHasDaylight = true;
+ }
+
+ private void takePicture(String whiteBalance) {
+ mParams.setWhiteBalance(whiteBalance);
+ mTestCamera.setParameters(mParams);
+
+ try{
+ Log.v(TAG, "Waiting for white balance to adjust");
+ Thread.sleep(4000);
+ Log.v(TAG, "END Waiting");
+ } catch (InterruptedException e) {}
+
+ mTestCamera.takePicture(null, null, null, mTestJpegListener);
+
+ // Thread locks until image capture is done
+ synchronized (mProcessingImage) {
+ try{
+ Log.v(TAG, "Start waiting for Image");
+ mProcessingImage.wait();
+ } catch (InterruptedException e) {
+ Log.v(TAG, "Callback wait fails!");
+ }
+ }
+ }
+
+ /**
+ * Runs the white balance camera test instance.
+ */
+ @Override
+ public synchronized void run(int index) {
+ Log.v(TAG, "WhiteBalanceTest thread started!");
+
+ if (!mHasDaylight) {
+ initializeWhiteBalanceTest();
+ }
+
+ if (index != 0) {
+ // Retrieves the list of supported white balance mode.
+ mParams = mTestCamera.getParameters();
+
+ int i = index - 1;
+ mWhiteBalance = mWhiteBalanceList.get(i);
+
+ Log.v(TAG, "Current white balance is " + mWhiteBalance);
+
+ takePicture(mWhiteBalance);
+
+ // Processes the white balance test data in the native code.
+ // Returns an array of CCT of each white balance modes, given the CCT
+ // of the "Daylight" mode is 5200K.
+ int colorTemperature = 0;
+
+ Log.v(TAG, "Finished taking picture, ready to process");
+ colorTemperature = processWhiteBalanceTest(mTestHandler);
+
+ // Records the index of the "Auto" white balance mode
+ if (mWhiteBalance.equals("daylight")) {
+ setReferenceTemperature(mAutoId, colorTemperature);
+ prepareDebugText(5200, index);
+ // Computes the reference CCT range of the "Auto" mode. Assuming that
+ // all grey squares on the color checker should be imaged as grey under
+ // a CCT, this CCT is used as a middle point to provide a range.
+ //setReferenceTemperature(mAutoId, colorTemperature[mWhiteBalanceList.size()]);
+ } else {
+ // Prepares the debug output.
+ prepareDebugText(colorTemperature, index);
+ }
+ } else {
+ for (int i = 0; i < mWhiteBalanceList.size(); i++) {
+ run(i + 1);
+ }
+ }
+
+ mParams.setWhiteBalance("auto");
+ mTestCamera.setParameters(mParams);
+ }
+
+ /**
+ * Prepares the debug results in HTML text. For each white balance mode,
+ * the CCT will be printed in green if it is in the reference range and
+ * red otherwise. The reference CCT range is also printed below, with
+ * green meaning the CCT range is satisfied and red otherwise.
+ *
+ * @param colorTemperature the CCT of the supported white balance modes
+ */
+ private void prepareDebugText(int colorTemperature, int index) {
+ mDebugText += String.format("CCT Ref is %d, %d, and CCT is %d",
+ mReferenceTemperature[index - 1][0],
+ mReferenceTemperature[index - 1][1],
+ colorTemperature);
+ Log.v(TAG, String.format("CCT Ref is %d, %d, and CCT is %d",
+ mReferenceTemperature[index - 1][0],
+ mReferenceTemperature[index - 1][1],
+ colorTemperature));
+ if ((colorTemperature >= mReferenceTemperature[index - 1][0]) &&
+ (colorTemperature <= mReferenceTemperature[index - 1][1])) {
+ mTestResults[index] = "Passed";
+ } else {
+ mTestResults[index] = "Failed";
+ }
+
+ }
+
+ @Override
+ public String getDebugText() {
+ return mDebugText;
+ }
+
+ @Override
+ public String getResultText() {
+ return mDebugText;
+ }
+
+ @Override
+ public String getTestName() {
+ return "White Balance Test: \n";
+ }
+
+ @Override
+ public String getTestName(int index) {
+ if (index != 0){
+ return String.format("%s mode test", mWhiteBalanceList.get(index - 1));
+ } else {
+ return "Run all tests";
+ }
+ }
+
+ @Override
+ public String getResult(int index) {
+ return mTestResults[index];
+ }
+
+ @Override
+ public int getNumTests() {
+ return mNumTests;
+ }
+
+ /**
+ * Sets the reference temperatures for the white balance modes of
+ * incandescent, fluorescent, warm-fluorescent, daylight, cloudy, shade
+ * and twilight. These are the currently supported White balance mode
+ * listed on the Android camera API.
+ *
+ * The reference range are summarized based on the published settings of
+ * Canon, Nikon and the references from Wikipedia on color temperature.
+ *
+ * @param i the index of the current white balance mode
+ * @param referenceWhiteBalance the name of the white balance mode.
+ */
+ private void setReferenceTemperature(int i, String referenceWhiteBalance) {
+ if (referenceWhiteBalance.equals("incandescent")) {
+ mReferenceTemperature[i][0] = 2500;
+ mReferenceTemperature[i][1] = 3500;
+ } else if (referenceWhiteBalance.equals("fluorescent")) {
+ mReferenceTemperature[i][0] = 3000;
+ mReferenceTemperature[i][1] = 6500;
+ } else if (referenceWhiteBalance.equals("warm-fluorescent")) {
+ mReferenceTemperature[i][0] = 2500;
+ mReferenceTemperature[i][1] = 3000;
+ } else if (referenceWhiteBalance.equals("daylight")) {
+ mReferenceTemperature[i][0] = 5000;
+ mReferenceTemperature[i][1] = 5400;
+ } else if (referenceWhiteBalance.equals("cloudy-daylight")) {
+ mReferenceTemperature[i][0] = 5500;
+ mReferenceTemperature[i][1] = 7500;
+ } else if (referenceWhiteBalance.equals("shade")) {
+ mReferenceTemperature[i][0] = 6800;
+ mReferenceTemperature[i][1] = 8000;
+ } else if (referenceWhiteBalance.equals("twilight")) {
+ mReferenceTemperature[i][0] = 10000;
+ mReferenceTemperature[i][1] = 14000;
+ }
+ }
+
+ /** Sets a reference range of CCT based on a given middle point CCT.
+ * The rerence range is from -10% of the CCT value to +10%.
+ *
+ * @param i the index of the current white balance mode
+ * @param t the middle point CCT.
+ */
+ private void setReferenceTemperature(int i, int t) {
+ mReferenceTemperature[i][0] = (int)((double)t * 0.9);
+ mReferenceTemperature[i][1] = (int)((double)t * 1.1);
+ }
+
+ private Camera.PictureCallback mTestJpegListener = new Camera.PictureCallback() {
+ public void onPictureTaken(byte[] data, Camera mCamera) {
+ Log.v(TAG, "Shutter pressed down!");
+ Bitmap inputImage;
+ try {
+ FileOutputStream outStream = new FileOutputStream(
+ String.format("/sdcard/wb%d.jpg", System.currentTimeMillis()));
+ outStream.write(data);
+ outStream.close();
+ } catch (FileNotFoundException e) {
+ } catch (IOException e) {}
+ // Decodes the camera data to Bitmap and creates a native image
+ // class with the Bitmap.
+ inputImage = BitmapFactory.decodeByteArray(data, 0, data.length);
+ long bufferAddress = findNative(inputImage);
+ Log.v(TAG, "findNative method finishes");
+
+ // Cleans up the Bitmap memory space.
+ inputImage.recycle();
+ data = null;
+ inputImage = null;
+ System.gc();
+
+ // Adds the data from the current image base class to the native
+ // white balance test handler.
+ createWhiteBalanceClass(bufferAddress, mTestHandler,
+ getCheckerCenter(), getCheckerRadius(), mWhiteBalance);
+
+ mCamera.startPreview();
+
+ // Notifies the thread lock that the image capture is finished
+ synchronized (mProcessingImage) {
+ mProcessingImage.notifyAll();
+ }
+ }
+ };
+
+ /**
+ * Creates a native white balance test handler.
+ *
+ * @return the memory address of the test handler
+ */
+ private native long createWhiteBalanceTest();
+
+ /**
+ * Adds the data of interest from the image class pointed by
+ * <code>bufferAddress</code> to the handler class pointed by
+ * <code>handlerAddress</code> by using the color checker coordinates.
+ * Also sets the white balance of this test.
+ *
+ * @param bufferAddress the memory address of the native image class
+ * containing the current camera captured image
+ * @param handlerAddress the memory address of the native white balance
+ * test handler instance
+ * @param checkerCenterAddress the memory address of the color checker
+ * center coordinates
+ * @param checkerRadiusAddress the memory address of the color checker
+ * radius
+ * @param whiteBalance the white balance mode used for shooting the image
+ */
+ private native void createWhiteBalanceClass(long bufferAddress, long handlerAddress,
+ long checkerCenterAddress,
+ long checkerRadiusAddress,
+ String whiteBalance);
+
+ /**
+ * Processes the white balance test in the native code. This is executed
+ * after the images are taken with all possible white balance modes. It
+ * uses the "Daylight" white balance mode as reference and computes the
+ * CCT of other white balance modes.
+ *
+ * @param handlerAddress the memory address of the native white balance
+ * test handler instance.
+ * @param colorTemperature the array to store the computed CCT of all white
+ * balance modes.
+ */
+ private native int processWhiteBalanceTest(long handlerAddress);
+
+ private native int getAutoTemperature(long handlerAddress);
+
+ static {
+ System.loadLibrary("cameraanalyzer");
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java
index f976a45..0697be2 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java
@@ -61,15 +61,19 @@
mNfcAdapter = nfcManager.getDefaultAdapter();
mPendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass())
.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-
- if (!mNfcAdapter.isEnabled()) {
- showDialog(NFC_NOT_ENABLED_DIALOG_ID);
- }
}
@Override
protected void onResume() {
super.onResume();
+
+ if (!mNfcAdapter.isEnabled()) {
+ showDialog(NFC_NOT_ENABLED_DIALOG_ID);
+ }
+
+ /* Only the sender requires mNfcAdapter.isNdefPushEnabled == true,
+ * so no need to check it here in the receiver. */
+
mNfcAdapter.enableForegroundDispatch(this, mPendingIntent, null, null);
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java
index 2a507d3..f3f37c4 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java
@@ -37,6 +37,7 @@
static final NdefMessage TEST_MESSAGE = getTestMessage();
private static final int NFC_NOT_ENABLED_DIALOG_ID = 1;
+ private static final int NDEF_PUSH_NOT_ENABLED_DIALOG_ID = 2;
private NfcAdapter mNfcAdapter;
@@ -52,10 +53,6 @@
NfcManager nfcManager = (NfcManager) getSystemService(NFC_SERVICE);
mNfcAdapter = nfcManager.getDefaultAdapter();
-
- if (!mNfcAdapter.isEnabled()) {
- showDialog(NFC_NOT_ENABLED_DIALOG_ID);
- }
}
private static NdefMessage getTestMessage() {
@@ -71,6 +68,14 @@
@Override
protected void onResume() {
super.onResume();
+
+ if (!mNfcAdapter.isEnabled()) {
+ showDialog(NFC_NOT_ENABLED_DIALOG_ID);
+ } else if (!mNfcAdapter.isNdefPushEnabled()) {
+ /* Sender must have NDEF push enabled */
+ showDialog(NDEF_PUSH_NOT_ENABLED_DIALOG_ID);
+ }
+
mNfcAdapter.enableForegroundNdefPush(this, TEST_MESSAGE);
}
@@ -85,7 +90,8 @@
switch (id) {
case NFC_NOT_ENABLED_DIALOG_ID:
return NfcDialogs.createNotEnabledDialog(this);
-
+ case NDEF_PUSH_NOT_ENABLED_DIALOG_ID:
+ return NfcDialogs.createNdefPushNotEnabledDialog(this);
default:
return super.onCreateDialog(id, args);
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NfcDialogs.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NfcDialogs.java
index 1130f2d..c78062b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NfcDialogs.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NfcDialogs.java
@@ -35,7 +35,22 @@
.setPositiveButton(R.string.nfc_settings, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Intent intent = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
+ Intent intent = new Intent(Settings.ACTION_NFC_SETTINGS);
+ context.startActivity(intent);
+ }
+ })
+ .create();
+ }
+
+ static AlertDialog createNdefPushNotEnabledDialog(final Context context) {
+ return new AlertDialog.Builder(context)
+ .setIcon(android.R.drawable.ic_dialog_alert)
+ .setTitle(R.string.ndef_push_not_enabled)
+ .setMessage(R.string.ndef_push_not_enabled_message)
+ .setPositiveButton(R.string.ndef_push_settings, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ Intent intent = new Intent(Settings.ACTION_NFCSHARING_SETTINGS);
context.startActivity(intent);
}
})
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/TagVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/TagVerifierActivity.java
index 082c143..85a9de5 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/TagVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/TagVerifierActivity.java
@@ -104,10 +104,6 @@
mPendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass())
.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
- if (!mNfcAdapter.isEnabled()) {
- showDialog(NFC_NOT_ENABLED_DIALOG_ID);
- }
-
goToWriteStep();
} else {
finish();
@@ -128,6 +124,10 @@
@Override
protected void onResume() {
super.onResume();
+ if (!mNfcAdapter.isEnabled()) {
+ showDialog(NFC_NOT_ENABLED_DIALOG_ID);
+ }
+
mNfcAdapter.enableForegroundDispatch(this, mPendingIntent, null, null);
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java
index 2b65421..369d32c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java
@@ -69,8 +69,6 @@
private Handler mHandler = new Handler();
private int mVideoWidth;
private int mVideoHeight;
- private boolean mIsVideoSizeKnown = false;
- private boolean mIsVideoReadyToBePlayed = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -170,17 +168,14 @@
@Override
public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
- mVideoWidth = width;
- mVideoHeight = height;
- mIsVideoSizeKnown = true;
- if (mIsVideoReadyToBePlayed && mIsVideoSizeKnown) {
- startVideoPlayback();
+ if (width != 0 && height != 0) {
+ mVideoWidth = width;
+ mVideoHeight = height;
+ fillScreen();
}
}
private void startVideoPlayback() {
- mHolder.setFixedSize(mVideoWidth, mVideoHeight);
- fillScreen();
mPlayer.start();
// Enable Pass button after 60 seconds
@@ -189,13 +184,11 @@
@Override
public void onPrepared(MediaPlayer mp) {
- mIsVideoReadyToBePlayed = true;
- if (mIsVideoReadyToBePlayed && mIsVideoSizeKnown) {
- startVideoPlayback();
- }
+ startVideoPlayback();
}
private void fillScreen() {
+ mHolder.setFixedSize(mVideoWidth, mVideoHeight);
Rect rect = new Rect();
mVideoFrame.getDrawingRect(rect);
LayoutParams lp = mSurfaceView.getLayoutParams();
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
index d122dec..d575e5f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
@@ -140,10 +140,10 @@
private TestListAdapter getStreamAdapter() {
ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
-// adapter.add(TestListItem.newCategory("RTSP"));
-// for (Stream stream : RTSP_STREAMS) {
-// addStreamToTests(adapter, stream);
-// }
+ adapter.add(TestListItem.newCategory("RTSP"));
+ for (Stream stream : RTSP_STREAMS) {
+ addStreamToTests(adapter, stream);
+ }
adapter.add(TestListItem.newCategory("HTTP Progressive"));
for (Stream stream : HTTP_STREAMS) {
diff --git a/development/ide/eclipse/.classpath b/development/ide/eclipse/.classpath
index 30c63d8..90963fb 100644
--- a/development/ide/eclipse/.classpath
+++ b/development/ide/eclipse/.classpath
@@ -53,13 +53,17 @@
<classpathentry kind="src" path="cts/tests/tests/speech/src"/>
<classpathentry kind="src" path="cts/tests/tests/telephony/src"/>
<classpathentry kind="src" path="cts/tests/tests/text/src"/>
+ <classpathentry kind="src" path="cts/tests/tests/theme/src"/>
<classpathentry kind="src" path="cts/tests/tests/util/src"/>
<classpathentry kind="src" path="cts/tests/tests/view/src"/>
<classpathentry kind="src" path="cts/tests/tests/webkit/src"/>
<classpathentry kind="src" path="cts/tests/tests/widget/src"/>
<classpathentry kind="src" path="cts/tools/cts-api-coverage/src"/>
- <classpathentry kind="src" path="cts/tools/cts-native-xml-generator/src"/>
+ <classpathentry kind="src" path="cts/tools/cts-java-scanner/src"/>
+ <classpathentry kind="src" path="cts/tools/cts-java-scanner-doclet/src"/>
+ <classpathentry kind="src" path="cts/tools/cts-native-scanner/src"/>
<classpathentry kind="src" path="cts/tools/cts-reference-app-lib/src"/>
+ <classpathentry kind="src" path="cts/tools/cts-xml-generator/src"/>
<classpathentry kind="src" path="cts/tools/dasm/src"/>
<classpathentry kind="src" path="cts/tools/device-setup/TestDeviceSetup/src"/>
<classpathentry kind="src" path="cts/tools/dex-tools/src"/>
@@ -72,6 +76,7 @@
<classpathentry kind="src" path="cts/tools/tradefed-host/tests/src"/>
<classpathentry kind="src" path="cts/tools/utils"/>
<classpathentry kind="src" path="cts/tools/vm-tests/src"/>
+ <classpathentry kind="src" path="external/easymock/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/CtsAccessibilityServiceTestCases_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/CtsTestStubs_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/CtsVerifier_intermediates/src"/>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index b66c6f9..eed137a 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -71,6 +71,7 @@
<uses-permission android:name="android.permission.DUMP" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+ <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
<!-- Used for PackageManager test, don't delete this INTERNET permission -->
<uses-permission android:name="android.permission.INTERNET" />
@@ -508,14 +509,18 @@
<activity android:name="android.widget.cts.GalleryStubActivity"
android:label="GalleryStubActivity">
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
</activity>
<activity android:name="android.widget.cts.MockPopupWindowStubActivity"
android:label="MockPopupWindowStubActivity">
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
</activity>
<activity android:name="android.media.cts.FaceDetectorStub"
@@ -651,9 +656,11 @@
<activity android:name="android.app.cts.InstrumentationTestActivity"
android:label="InstrumentationTestActivity">
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.dir/person" />
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="vnd.android.cursor.dir/person" />
+ </intent-filter>
</activity>
<activity android:name="android.app.cts.AliasActivityStub">
@@ -762,8 +769,10 @@
<activity android:name="android.view.cts.FocusFinderStubActivity"
android:label="FocusFinderStubActivity">
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<activity android:name="android.view.cts.GestureDetectorStubActivity"
@@ -950,6 +959,15 @@
<activity android:name="android.opengl.cts.EglConfigStubActivity"/>
+ <activity android:name="android.opengl.cts.CompressedTextureStubActivity"
+ android:label="CompressedTextureStubActivity"
+ android:screenOrientation="nosensor">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
<activity android:name="android.preference.cts.PreferenceStubActivity">
<meta-data android:name="android.preference"
android:resource="@xml/preferences_from_intent" />
@@ -973,6 +991,7 @@
android:label="RenderscriptGLStub"/>
</application>
+
<!--Test for PackageManager, please put this at the very beginning-->
<instrumentation android:name="android.content.pm.cts.TestPmInstrumentation"
android:targetPackage="android"
diff --git a/tests/ApiDemosReferenceTest/Android.mk b/tests/ApiDemosReferenceTest/Android.mk
deleted file mode 100644
index 315ecd6..0000000
--- a/tests/ApiDemosReferenceTest/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := android.cts.refapp
-
-LOCAL_INSTRUMENTATION_FOR := ApiDemos
-
-LOCAL_PACKAGE_NAME := ApiDemosReferenceTest
-
-include $(BUILD_PACKAGE)
diff --git a/tests/ApiDemosReferenceTest/AndroidManifest.xml b/tests/ApiDemosReferenceTest/AndroidManifest.xml
deleted file mode 100644
index 7700bdd..0000000
--- a/tests/ApiDemosReferenceTest/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- android:versionCode="1" android:versionName="1.0.0" package="android.apidemos.cts">
- <instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.example.android.apis" android:label="Tests for Api Demos." />
- <application>
- <uses-library android:name="android.test.runner" />
- </application>
-</manifest>
diff --git a/tests/ApiDemosReferenceTest/src/android/apidemos/cts/AllTests.java b/tests/ApiDemosReferenceTest/src/android/apidemos/cts/AllTests.java
deleted file mode 100644
index 6d9f691..0000000
--- a/tests/ApiDemosReferenceTest/src/android/apidemos/cts/AllTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.apidemos.cts;
-
-import android.test.TestSuiteProvider;
-import android.test.suitebuilder.TestSuiteBuilder;
-
-import junit.framework.TestSuite;
-
-/**
- * Finds all instrumentation and unit tests for this application.
- */
-public class AllTests implements TestSuiteProvider {
- public TestSuite getTestSuite() {
- return new TestSuiteBuilder(getClass()).includeAllPackagesUnderHere().build();
- }
-}
diff --git a/tests/ApiDemosReferenceTest/src/android/apidemos/cts/ApiDemosTest.java b/tests/ApiDemosReferenceTest/src/android/apidemos/cts/ApiDemosTest.java
deleted file mode 100644
index 5382578..0000000
--- a/tests/ApiDemosReferenceTest/src/android/apidemos/cts/ApiDemosTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.apidemos.cts;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.cts.refapp.ReferenceAppTestCase;
-import android.view.KeyEvent;
-
-import com.example.android.apis.ApiDemos;
-
-import java.util.List;
-
-public class ApiDemosTest extends ReferenceAppTestCase<ApiDemos> {
- public ApiDemosTest() {
- super("com.example.android.apis", ApiDemos.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- // Make sure the list view always resets its selection to the top of
- // the list.
- final ApiDemos a = getActivity();
- getInstrumentation().runOnMainSync(new Runnable() {
- public void run() {
- a.setSelection(0);
- }
- });
- }
-
- public void testdPadNav() {
- final ApiDemos a = getActivity();
- assert(a.getSelectedItemPosition() == 0);
-
- sendKeys(KeyEvent.KEYCODE_DPAD_UP);
- assert(a.getSelectedItemPosition() == 0);
-
- sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
- assert(a.getSelectedItemPosition() == 1);
-
- sendKeys(KeyEvent.KEYCODE_DPAD_LEFT);
- assert(a.getSelectedItemPosition() == 1);
-
- sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
- assert(a.getSelectedItemPosition() == 1);
- }
-
- public void testNumberOfItemsInListView() {
- final ApiDemos a = getActivity();
-
- // ApiDemo's builds its list by looking at all the Intent's in it's
- // package that are marked as CATEGORY_SAMPLE_CODE.
- Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
- mainIntent.addCategory(Intent.CATEGORY_SAMPLE_CODE);
-
- PackageManager pm = a.getPackageManager();
- List<ResolveInfo> list = pm.queryIntentActivities(mainIntent, 0);
- int numberOfActivities = list.size();
-
- for (int x = 0; x < numberOfActivities; ++x) {
- sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
- assert(a.getSelectedItemPosition() == x + 1);
- }
-
- // Should be at bottom of the list
- sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
- assert(a.getSelectedItemPosition() == numberOfActivities);
-
- // Record what the bottom of the list looks like.
- takeSnapshot("snap1");
- }
-}
diff --git a/tests/appsecurity-tests/Android.mk b/tests/appsecurity-tests/Android.mk
index b5ce83c..4dd8d5c 100644
--- a/tests/appsecurity-tests/Android.mk
+++ b/tests/appsecurity-tests/Android.mk
@@ -16,8 +16,6 @@
include $(CLEAR_VARS)
-#LOCAL_TEST_TYPE := hostSideOnly
-
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -25,8 +23,9 @@
LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt ddmlib-prebuilt junit
-include $(BUILD_HOST_JAVA_LIBRARY)
+LOCAL_CTS_TEST_PACKAGE := android.tests.appsecurity
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
# Build the test APKs using their own makefiles
include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/tests/assets/webkit/jsform.html b/tests/assets/webkit/jsform.html
index 1781194..ce55498 100644
--- a/tests/assets/webkit/jsform.html
+++ b/tests/assets/webkit/jsform.html
@@ -24,7 +24,7 @@
}
}
</script>
- <body onload="window.setTimeout(function() { fireSubmit(); }, 0);">
+ <body onload="window.setTimeout(function() { fireSubmit(); }, 500);">
javascript form test
<form id="formId" action="test.html#result" method="post">
<input type="hidden" name="foo" value="bar" />
diff --git a/tests/config_demo/data/case_rep/APICheckTest_java5.apk b/tests/config_demo/data/case_rep/APICheckTest_java5.apk
deleted file mode 100644
index fcb51c4..0000000
--- a/tests/config_demo/data/case_rep/APICheckTest_java5.apk
+++ /dev/null
Binary files differ
diff --git a/tests/config_demo/data/case_rep/APICheckTest_java6.apk b/tests/config_demo/data/case_rep/APICheckTest_java6.apk
deleted file mode 100644
index 76c8f74..0000000
--- a/tests/config_demo/data/case_rep/APICheckTest_java6.apk
+++ /dev/null
Binary files differ
diff --git a/tests/config_demo/data/case_rep/DeviceInforCollector.apk b/tests/config_demo/data/case_rep/DeviceInforCollector.apk
deleted file mode 100644
index 24de83f..0000000
--- a/tests/config_demo/data/case_rep/DeviceInforCollector.apk
+++ /dev/null
Binary files differ
diff --git a/tests/config_demo/data/host_config.xml b/tests/config_demo/data/host_config.xml
deleted file mode 100644
index 4e4cb9a..0000000
--- a/tests/config_demo/data/host_config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<HostConfiguration version="1.0">
- <Repository>
- <!-- Specific OEM test plan directory (optional) -->
- <TestPlan path="plan_rep" />
- <!-- Specific OEM test case directory (optional) -->
- <TestCase path="case_rep" />
- <!-- Specific OEM test result directory (optional) -->
- <TestResult path="result_rep" />
- </Repository>
-</HostConfiguration>
diff --git a/tests/config_demo/data/plan_rep/README b/tests/config_demo/data/plan_rep/README
deleted file mode 100644
index 2f36f40..0000000
--- a/tests/config_demo/data/plan_rep/README
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2008 The Android Open Source Project
-
-Licensed under the Apache Licence, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This directory would be the repository of the test plans.
-
-For detailed descriptions, please refer to the architecture document.
diff --git a/tests/config_demo/data/result_rep/cts_result.xsl b/tests/config_demo/data/result_rep/cts_result.xsl
deleted file mode 100644
index 9c9c82a..0000000
--- a/tests/config_demo/data/result_rep/cts_result.xsl
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp " "> ]>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
- <xsl:template match="/">
-
- <html>
- <STYLE type="text/css">
- .plan { background-color : #9acd32 }
- .head { font-size : 30; background-color : #A8A6A6 }
- .head1 { font-size : 20; background-color : #A8A6A6 }
- .lgreen {background-color : #9acd32}
- .pass {background-color : #00ff00}
- .failed {background-color : #ff0000}
- .timeout {background-color : #febf00}
- .notrun {background-color : #C6C3C3}
- .gray {background-color : #C6C3C3}
- </STYLE>
- <body>
- <p class="head">CTS Test result</p>
-
- <!-- plan information -->
- <TABLE >
- <TR class="plan">
- <TD>Plan name</TD>
- <TD>Start time</TD>
- <TD>End time</TD>
- <TD>Version</TD>
- </TR>
- <TR>
- <TD>
- <xsl:value-of select="TestResult/@testPlan"/>
- </TD>
- <TD>
- <xsl:value-of select="TestResult/@starttime"/>
- </TD>
- <TD>
- <xsl:value-of select="TestResult/@endtime"/>
- </TD>
- <TD>
- <xsl:value-of select="TestResult/@version"/>
- </TD>
- </TR>
- </TABLE>
- <!-- Device infor -->
- <p class="head1">Test Device information</p>
- <TABLE >
- <TR>
- <TD class="lgreen">Device Make</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildName"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Build model</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Firmware Version</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildVersion"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Firmware Build Number</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildID"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Android Platform Version</TD>
- <TD>
- <xsl:value-of
- select="TestResult/DeviceInfo/BuildInfo/@androidPlatformVersion"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Supported Locales</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@locales"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Screen size</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/Screen/@resolution"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Phone number</TD>
- <TD>
- <xsl:value-of
- select="TestResult/DeviceInfo/PhoneSubInfo/@subscriberId"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">x dpi</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Xdpi"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">y dpi</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Ydpi"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Touch</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@touch"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Navigation</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@navigation"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Keypad</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@keypad"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">Network</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@network"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">IMEI</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imei"/>
- </TD>
- </TR>
- <TR>
- <TD class="lgreen">IMSI</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imsi"/>
- </TD>
- </TR>
- </TABLE>
- <!-- Summary -->
- <p class="head1">Summary</p>
- <TABLE >
- <TR>
- <TD class="pass">pass</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@pass"/>
- </TD>
- </TR>
- <TR>
- <TD class="failed">failed</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@failed"/>
- </TD>
- </TR>
- <TR>
- <TD class="timeout">timeout</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@timeout"/>
- </TD>
- </TR>
- <TR>
- <TD class="notrun">notrun</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@notrun"/>
- </TD>
- </TR>
- </TABLE>
- <!-- test package -->
- <xsl:for-each select="TestResult/TestPackage">
- <p class="head1">
- TestPackage:
- <xsl:value-of select="@name"/>
- </p>
-
- <TABLE border="0.1">
- <!-- level 1 test suite -->
- <xsl:for-each select="TestSuite">
- <TR>
- <TD class="gray">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- </TR>
- <xsl:for-each select="TestCase">
- <TR>
- <TD></TD>
- <TD class="gray">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- </TR>
- <xsl:for-each select="Test">
- <TR>
- <TD></TD>
- <TD></TD>
-
- <xsl:if test="@result='pass'">
- <TD class="pass">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="pass">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <xsl:if test="@result='fail'">
- <TD class="failed">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="failed">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <xsl:if test="@result='timeout'">
- <TD class="timeout">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="timeout">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <xsl:if test="@result='notrun'">
- <TD class="notrun">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="notrun">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <TD></TD>
- </TR>
- </xsl:for-each>
- </xsl:for-each>
- <!-- level 2 test suite -->
- <xsl:for-each select="TestSuite">
- <TR>
- <TD></TD>
- <TD class="gray">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- </TR>
- <xsl:for-each select="TestCase">
- <TR>
- <TD></TD>
- <TD></TD>
- <TD class="gray">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="gray"></TD>
- <TD class="gray"></TD>
- </TR>
- <xsl:for-each select="Test">
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
-
- <xsl:if test="@result='pass'">
- <TD class="pass">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="pass">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <xsl:if test="@result='fail'">
- <TD class="failed">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="failed">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <xsl:if test="@result='timeout'">
- <TD class="timeout">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="timeout">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- <xsl:if test="@result='notrun'">
- <TD class="notrun">
- <xsl:value-of select="@name"/>
- </TD>
- <TD class="notrun">
- <xsl:value-of select="@result"/>
- </TD>
- </xsl:if>
-
- </TR>
- </xsl:for-each>
- </xsl:for-each>
-
- </xsl:for-each>
- </xsl:for-each>
- </TABLE>
- </xsl:for-each>
- <!-- end test package -->
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index bdfd51b..0d4f101 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -1,34 +1,2 @@
[
-{
- name: "android.telephony.cts.PhoneNumberFormattingTextWatcherTest#testPhoneNumberFormattingTextWatcher",
- bug: 3198578
-},
-{
- name: "android.text.cts.AndroidCharacterTest#testMirror",
- bug: 4371654
-},
-{
- name: "android.webkit.cts.WebViewTest#testRequestFocusNodeHref",
- bug: 3241968
-},
-{
- names: [
- "libcore.java.net.URLConnectionTest#testServerClosesSocket",
- "libcore.java.net.URLConnectionTest#testServerShutdownInput",
- "libcore.java.net.URLConnectionTest#testServerShutdownOutput"
- ],
- bug: 5534202
-},
-{
- names: [
- "libcore.java.net.ConcurrentCloseTest#test_read",
- "libcore.net.http.HttpResponseCacheTest#testClientPrematureDisconnectWithChunkedEncoding"
- ],
- bug: 5498103
-},
-{
- name: "libcore.java.security.KeyPairGeneratorTest#test_getInstance",
- bug: 5513723
-}
]
-
diff --git a/tests/jni/android_net_cts_NetlinkSocket.cpp b/tests/jni/android_net_cts_NetlinkSocket.cpp
index 1e671c6..f2fc38f 100644
--- a/tests/jni/android_net_cts_NetlinkSocket.cpp
+++ b/tests/jni/android_net_cts_NetlinkSocket.cpp
@@ -31,7 +31,7 @@
{
int sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
if (sock == -1) {
- LOGE("Can't create socket %s", strerror(errno));
+ ALOGE("Can't create socket %s", strerror(errno));
jclass SocketException = env->FindClass("java/net/SocketException");
env->ThrowNew(SocketException, "Can't create socket");
return;
diff --git a/tests/res/raw/basetex.png b/tests/res/raw/basetex.png
new file mode 100644
index 0000000..c47a8a5
--- /dev/null
+++ b/tests/res/raw/basetex.png
Binary files differ
diff --git a/tests/res/raw/ddstex.dds b/tests/res/raw/ddstex.dds
new file mode 100644
index 0000000..a865693
--- /dev/null
+++ b/tests/res/raw/ddstex.dds
Binary files differ
diff --git a/tests/res/raw/pvrtex.pvr b/tests/res/raw/pvrtex.pvr
new file mode 100644
index 0000000..c92962d
--- /dev/null
+++ b/tests/res/raw/pvrtex.pvr
Binary files differ
diff --git a/tests/src/android/app/cts/IntentServiceStub.java b/tests/src/android/app/cts/IntentServiceStub.java
index af4cd27..043ff85 100644
--- a/tests/src/android/app/cts/IntentServiceStub.java
+++ b/tests/src/android/app/cts/IntentServiceStub.java
@@ -18,9 +18,9 @@
import android.app.IntentService;
import android.content.Intent;
+import android.cts.util.PollingCheck;
import android.os.Binder;
import android.os.IBinder;
-import android.view.animation.cts.DelayedCheck;
public class IntentServiceStub extends IntentService {
public IntentServiceStub() {
@@ -50,7 +50,7 @@
}
public static void waitToFinish(long timeout) throws Throwable {
- new DelayedCheck(timeout) {
+ new PollingCheck(timeout) {
@Override
protected boolean check() {
return IntentServiceStub.onDestroyCalled;
diff --git a/tests/src/android/cts/util/PollingCheck.java b/tests/src/android/cts/util/PollingCheck.java
new file mode 100644
index 0000000..8870fb9
--- /dev/null
+++ b/tests/src/android/cts/util/PollingCheck.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.cts.util;
+
+import junit.framework.Assert;
+
+public abstract class PollingCheck {
+ private static final long TIME_SLICE = 50;
+ private long mTimeout = 3000;
+
+ public PollingCheck() {
+ }
+
+ public PollingCheck(long timeout) {
+ mTimeout = timeout;
+ }
+
+ protected abstract boolean check();
+
+ public void run() {
+ if (check()) {
+ return;
+ }
+
+ long timeout = mTimeout;
+ while (timeout > 0) {
+ try {
+ Thread.sleep(TIME_SLICE);
+ } catch (InterruptedException e) {
+ Assert.fail("unexpected InterruptedException");
+ }
+
+ if (check()) {
+ return;
+ }
+
+ timeout -= TIME_SLICE;
+ }
+
+ Assert.fail("unexpected timeout");
+ }
+}
diff --git a/tests/src/android/opengl/cts/CompressedTextureLoader.java b/tests/src/android/opengl/cts/CompressedTextureLoader.java
new file mode 100644
index 0000000..2cb6910
--- /dev/null
+++ b/tests/src/android/opengl/cts/CompressedTextureLoader.java
@@ -0,0 +1,485 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.opengl.cts;
+
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.Buffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+
+import com.android.cts.stub.R;
+
+import android.app.Activity;
+import android.content.res.AssetFileDescriptor;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.util.Log;
+
+import android.opengl.ETC1;
+import android.opengl.ETC1Util;
+import android.opengl.GLES20;
+
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+
+public class CompressedTextureLoader {
+ private static final String TAG = "CompressedTextureLoader";
+
+ public static final String TEXTURE_UNCOMPRESSED = "UNCOMPRESSED";
+ public static final String TEXTURE_ETC1 = "ETC1";
+ public static final String TEXTURE_S3TC = "S3TC";
+ public static final String TEXTURE_ATC = "ATC";
+ public static final String TEXTURE_PVRTC = "PVRTC";
+
+ public static class Texture {
+ public Texture(int width, int height, int internalformat, ByteBuffer data,
+ String formatName) {
+ mWidth = width;
+ mHeight = height;
+ mInternalFormat = internalformat;
+ mData = data;
+ mFormatName = formatName;
+ }
+
+ /**
+ * Get the width of the texture in pixels.
+ * @return the width of the texture in pixels.
+ */
+ public int getWidth() { return mWidth; }
+
+ /**
+ * Get the height of the texture in pixels.
+ * @return the width of the texture in pixels.
+ */
+ public int getHeight() { return mHeight; }
+
+ /**
+ * Get the compressed data of the texture.
+ * @return the texture data.
+ */
+ public ByteBuffer getData() { return mData; }
+
+ /**
+ * Get the format of the texture.
+ * @return the internal format.
+ */
+ public int getFormat() { return mInternalFormat; }
+
+ /**
+ * Get the format of the texture.
+ * @return the internal format.
+ */
+ public boolean isSupported() { return isFormatSupported(mFormatName); }
+
+ private int mWidth;
+ private int mHeight;
+ private int mInternalFormat;
+ private ByteBuffer mData;
+ private String mFormatName;
+ }
+
+ /* .pvr header is described by the following c struct
+ typedef struct PVR_TEXTURE_HEADER_TAG{
+ unsigned int dwHeaderSize; // size of the structure
+ unsigned int dwHeight; // height of surface to be created
+ unsigned int dwWidth; // width of input surface
+ unsigned int dwMipMapCount; // number of MIP-map levels requested
+ unsigned int dwpfFlags; // pixel format flags
+ unsigned int dwDataSize; // Size of the compress data
+ unsigned int dwBitCount; // number of bits per pixel
+ unsigned int dwRBitMask; // mask for red bit
+ unsigned int dwGBitMask; // mask for green bits
+ unsigned int dwBBitMask; // mask for blue bits
+ unsigned int dwAlphaBitMask; // mask for alpha channel
+ unsigned int dwPVR; // should be 'P' 'V' 'R' '!'
+ unsigned int dwNumSurfs; //number of slices for volume textures or skyboxes
+ } PVR_TEXTURE_HEADER;
+ */
+ static final int PVR_HEADER_SIZE = 13 * 4;
+ static final int PVR_2BPP = 24;
+ static final int PVR_4BPP = 25;
+ static final int PVR_MAGIC_NUMBER = 559044176;
+
+ static final int GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 0x8C00;
+ static final int GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG = 0x8C01;
+ static final int GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 0x8C02;
+ static final int GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG = 0x8C03;
+
+ static class PVRHeader {
+ int mHeaderSize; // size of the structure
+ int mHeight; // height of surface to be created
+ int mWidth; // width of input surface
+ int mMipMapCount; // number of MIP-map levels requested
+ int mpfFlags; // pixel format flags
+ int mDataSize; // Size of the compress data
+ int mBitCount; // number of bits per pixel
+ int mRBitMask; // mask for red bit
+ int mGBitMask; // mask for green bits
+ int mBBitMask; // mask for blue bits
+ int mAlphaBitMask; // mask for alpha channel
+ int mPVR; // should be 'P' 'V' 'R' '!'
+ int mNumSurfs; //number of slices for volume textures or skyboxes
+ }
+
+ protected static PVRHeader readPVRHeader(InputStream is) {
+
+ byte[] headerData = new byte[PVR_HEADER_SIZE];
+ try {
+ is.read(headerData);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to read data");
+ }
+
+ ByteBuffer headerBuffer = ByteBuffer.allocateDirect(PVR_HEADER_SIZE)
+ .order(ByteOrder.nativeOrder());
+ headerBuffer.put(headerData, 0, PVR_HEADER_SIZE).position(0);
+
+ PVRHeader header = new PVRHeader();
+
+ header.mHeaderSize = headerBuffer.getInt();
+ header.mHeight = headerBuffer.getInt();
+ header.mWidth = headerBuffer.getInt();
+ header.mMipMapCount = headerBuffer.getInt();
+ header.mpfFlags = headerBuffer.getInt();
+ header.mDataSize = headerBuffer.getInt();
+ header.mBitCount = headerBuffer.getInt();
+ header.mRBitMask = headerBuffer.getInt();
+ header.mGBitMask = headerBuffer.getInt();
+ header.mBBitMask = headerBuffer.getInt();
+ header.mAlphaBitMask = headerBuffer.getInt();
+ header.mPVR = headerBuffer.getInt();
+ header.mNumSurfs = headerBuffer.getInt();
+
+ if (header.mHeaderSize != PVR_HEADER_SIZE ||
+ header.mPVR != PVR_MAGIC_NUMBER) {
+ throw new RuntimeException("Invalid header data");
+ }
+
+ return header;
+ }
+
+ public static Texture loadTextureATC(Resources res, int id) {
+ Texture tex = new Texture(0, 0, 0, null, "Stub!");
+ return tex;
+ }
+
+ private static ETC1Util.ETC1Texture compressTexture(Buffer input,
+ int width, int height,
+ int pixelSize, int stride){
+ int encodedImageSize = ETC1.getEncodedDataSize(width, height);
+ ByteBuffer compressedImage = ByteBuffer.allocateDirect(encodedImageSize).
+ order(ByteOrder.nativeOrder());
+ ETC1.encodeImage(input, width, height, pixelSize, stride, compressedImage);
+ return new ETC1Util.ETC1Texture(width, height, compressedImage);
+ }
+
+ public static Texture createFromUncompressedETC1(Bitmap bitmap) {
+ int dataSize = bitmap.getRowBytes() * bitmap.getHeight();
+
+ ByteBuffer dataBuffer;
+ dataBuffer = ByteBuffer.allocateDirect(dataSize).order(ByteOrder.nativeOrder());
+ bitmap.copyPixelsToBuffer(dataBuffer);
+ dataBuffer.position(0);
+
+ int bytesPerPixel = bitmap.getRowBytes() / bitmap.getWidth();
+ ETC1Util.ETC1Texture compressed = compressTexture(dataBuffer,
+ bitmap.getWidth(),
+ bitmap.getHeight(),
+ bytesPerPixel,
+ bitmap.getRowBytes());
+
+ Texture tex = new Texture(compressed.getWidth(), compressed.getHeight(),
+ ETC1.ETC1_RGB8_OES, compressed.getData(), TEXTURE_ETC1);
+
+ return tex;
+ }
+
+ private static ByteBuffer read(InputStream is, int dataSize) {
+ ByteBuffer dataBuffer;
+ dataBuffer = ByteBuffer.allocateDirect(dataSize).order(ByteOrder.nativeOrder());
+ byte[] ioBuffer = new byte[4096];
+ for (int i = 0; i < dataSize; ) {
+ int chunkSize = Math.min(ioBuffer.length, dataSize - i);
+ try {
+ is.read(ioBuffer, 0, chunkSize);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to read data");
+ }
+ dataBuffer.put(ioBuffer, 0, chunkSize);
+ i += chunkSize;
+ }
+ dataBuffer.position(0);
+ return dataBuffer;
+ }
+
+ public static Texture loadTexturePVRTC(Resources res, int id) {
+ InputStream is = null;
+ try {
+ is = res.openRawResource(id);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to open resource " + id);
+ }
+
+ PVRHeader header = readPVRHeader(is);
+
+ int format = header.mpfFlags & 0xFF;
+ int internalFormat = 0;
+ if (format == PVR_2BPP && header.mAlphaBitMask == 1) {
+ internalFormat = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
+ } else if (format == PVR_2BPP && header.mAlphaBitMask == 0) {
+ internalFormat = GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
+ } else if (format == PVR_4BPP && header.mAlphaBitMask == 1) {
+ internalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
+ } else if (format == PVR_4BPP && header.mAlphaBitMask == 0) {
+ internalFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
+ }
+
+ // only load the first mip level for now
+ int dataSize = (header.mWidth * header.mHeight * header.mBitCount) >> 3;
+ ByteBuffer dataBuffer = read(is, dataSize);
+ Texture tex = new Texture(header.mWidth, header.mHeight,
+ internalFormat, dataBuffer,
+ TEXTURE_PVRTC);
+ try {
+ is.close();
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to close resource stream " + id);
+ }
+ return tex;
+ }
+
+ /* DDS Header is described by the following structs
+ typedef struct {
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwHeight;
+ DWORD dwWidth;
+ DWORD dwPitchOrLinearSize;
+ DWORD dwDepth;
+ DWORD dwMipMapCount;
+ DWORD dwReserved1[11];
+ DDS_PIXELFORMAT ddspf;
+ DWORD dwCaps;
+ DWORD dwCaps2;
+ DWORD dwCaps3;
+ DWORD dwCaps4;
+ DWORD dwReserved2;
+ } DDS_HEADER;
+
+ struct DDS_PIXELFORMAT {
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwFourCC;
+ DWORD dwRGBBitCount;
+ DWORD dwRBitMask;
+ DWORD dwGBitMask;
+ DWORD dwBBitMask;
+ DWORD dwABitMask;
+ };
+
+ In the file it looks like this
+ DWORD dwMagic;
+ DDS_HEADER header;
+ DDS_HEADER_DXT10 header10; // If the DDS_PIXELFORMAT dwFlags is set to DDPF_FOURCC
+ // and dwFourCC is DX10
+
+ */
+
+ static final int DDS_HEADER_STRUCT_SIZE = 124;
+ static final int DDS_PIXELFORMAT_STRUCT_SIZE = 32;
+ static final int DDS_HEADER_SIZE = 128;
+ static final int DDS_MAGIC_NUMBER = 0x20534444;
+ static final int DDS_DDPF_FOURCC = 0x4;
+ static final int DDS_DXT1 = 0x31545844;
+ static final int DDS_DXT5 = 0x35545844;
+
+ static final int COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
+ static final int COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
+ static final int COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
+
+ static class DDSHeader {
+ int mMagic;
+ int mSize;
+ int mFlags;
+ int mHeight;
+ int mWidth;
+ int mPitchOrLinearSize;
+ int mDepth;
+ int mMipMapCount;
+ int[] mReserved1;
+ // struct DDS_PIXELFORMAT {
+ int mPixelFormatSize;
+ int mPixelFormatFlags;
+ int mPixelFormatFourCC;
+ int mPixelFormatRGBBitCount;
+ int mPixelFormatRBitMask;
+ int mPixelFormatGBitMask;
+ int mPixelFormatBBitMask;
+ int mPixelFormatABitMask;
+ // };
+ int mCaps;
+ int mCaps2;
+ int mCaps3;
+ int mCaps4;
+ int mReserved2;
+
+ DDSHeader() {
+ mReserved1 = new int[11];
+ }
+ }
+
+ protected static DDSHeader readDDSHeader(InputStream is) {
+
+ byte[] headerData = new byte[DDS_HEADER_SIZE];
+ try {
+ is.read(headerData);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to read data");
+ }
+
+ ByteBuffer headerBuffer = ByteBuffer.allocateDirect(DDS_HEADER_SIZE)
+ .order(ByteOrder.nativeOrder());
+ headerBuffer.put(headerData, 0, DDS_HEADER_SIZE).position(0);
+
+ DDSHeader header = new DDSHeader();
+
+ header.mMagic = headerBuffer.getInt();
+ header.mSize = headerBuffer.getInt();
+ header.mFlags = headerBuffer.getInt();
+ header.mHeight = headerBuffer.getInt();
+ header.mWidth = headerBuffer.getInt();
+ header.mPitchOrLinearSize = headerBuffer.getInt();
+ header.mDepth = headerBuffer.getInt();
+ header.mMipMapCount = headerBuffer.getInt();
+ for (int i = 0; i < header.mReserved1.length; i ++) {
+ header.mReserved1[i] = headerBuffer.getInt();
+ }
+ // struct DDS_PIXELFORMAT {
+ header.mPixelFormatSize = headerBuffer.getInt();
+ header.mPixelFormatFlags = headerBuffer.getInt();
+ header.mPixelFormatFourCC = headerBuffer.getInt();
+ header.mPixelFormatRGBBitCount = headerBuffer.getInt();
+ header.mPixelFormatRBitMask = headerBuffer.getInt();
+ header.mPixelFormatGBitMask = headerBuffer.getInt();
+ header.mPixelFormatBBitMask = headerBuffer.getInt();
+ header.mPixelFormatABitMask = headerBuffer.getInt();
+ // };
+ header.mCaps = headerBuffer.getInt();
+ header.mCaps2 = headerBuffer.getInt();
+ header.mCaps3 = headerBuffer.getInt();
+ header.mCaps4 = headerBuffer.getInt();
+ header.mReserved2 = headerBuffer.getInt();
+
+ if (header.mSize != DDS_HEADER_STRUCT_SIZE ||
+ header.mPixelFormatSize != DDS_PIXELFORMAT_STRUCT_SIZE ||
+ header.mMagic != DDS_MAGIC_NUMBER) {
+ throw new RuntimeException("Invalid header data");
+ }
+
+ return header;
+ }
+
+ // Very simple loader that only reads in the header and a DXT1 mip level 0
+ public static Texture loadTextureDXT(Resources res, int id) {
+ InputStream is = null;
+ try {
+ is = res.openRawResource(id);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to open resource " + id);
+ }
+
+ DDSHeader header = readDDSHeader(is);
+
+ if (header.mPixelFormatFlags != DDS_DDPF_FOURCC) {
+ throw new RuntimeException("Unsupported DXT data");
+ }
+
+ int internalFormat = 0;
+ int bpp = 0;
+ switch (header.mPixelFormatFourCC) {
+ case DDS_DXT1:
+ internalFormat = COMPRESSED_RGB_S3TC_DXT1_EXT;
+ bpp = 4;
+ break;
+ case DDS_DXT5:
+ internalFormat = COMPRESSED_RGBA_S3TC_DXT5_EXT;
+ bpp = 8;
+ break;
+ default:
+ throw new RuntimeException("Unsupported DXT data");
+ }
+
+ // only load the first mip level for now
+ int dataSize = (header.mWidth * header.mHeight * bpp) >> 3;
+ if (dataSize != header.mPitchOrLinearSize) {
+ throw new RuntimeException("Expected data and header mismatch");
+ }
+ ByteBuffer dataBuffer = read(is, dataSize);
+
+ Texture tex = new Texture(header.mWidth, header.mHeight, internalFormat,
+ dataBuffer, TEXTURE_S3TC);
+ return tex;
+ }
+
+ static HashMap<String, Boolean> sExtensionMap;
+ static HashMap<String, Boolean> sFormatMap;
+
+ private static synchronized void updateSupportedFormats() {
+ if (sExtensionMap != null) {
+ return;
+ }
+
+ sExtensionMap = new HashMap<String, Boolean>();
+ sFormatMap = new HashMap<String, Boolean>();
+ String extensionList = GLES20.glGetString(GLES20.GL_EXTENSIONS);
+
+ for (String extension : extensionList.split(" ")) {
+ sExtensionMap.put(extension, true);
+ }
+
+ // Check ETC1
+ sFormatMap.put(TEXTURE_ETC1, ETC1Util.isETC1Supported());
+ // Check ATC
+ if (sExtensionMap.get("GL_AMD_compressed_ATC_texture") != null ||
+ sExtensionMap.get("GL_ATI_compressed_texture_atitc") != null ||
+ sExtensionMap.get("GL_ATI_texture_compression_atitc") != null) {
+ sFormatMap.put(TEXTURE_ATC, true);
+ }
+ // Check DXT
+ if (sExtensionMap.get("GL_EXT_texture_compression_dxt1") != null ||
+ sExtensionMap.get("GL_EXT_texture_compression_s3tc") != null ||
+ sExtensionMap.get("OES_texture_compression_S3TC") != null) {
+ sFormatMap.put(TEXTURE_S3TC, true);
+ }
+ // Check DXT
+ if (sExtensionMap.get("GL_IMG_texture_compression_pvrtc") != null) {
+ sFormatMap.put(TEXTURE_PVRTC, true);
+ }
+
+ /*Log.i(TAG, "mIsSupportedETC1 " + sFormatMap.get(TEXTURE_ETC1));
+ Log.i(TAG, "mIsSupportedATC " + sFormatMap.get(TEXTURE_ATC));
+ Log.i(TAG, "mIsSupportedDXT " + sFormatMap.get(TEXTURE_S3TC));
+ Log.i(TAG, "mIsSupportedPVRTC " + sFormatMap.get(TEXTURE_PVRTC));*/
+ }
+
+ private static boolean isFormatSupported(String format) {
+ updateSupportedFormats();
+ Boolean supported = sFormatMap.get(format);
+ return supported != null ? supported : false;
+ }
+}
diff --git a/tests/src/android/opengl/cts/CompressedTextureStubActivity.java b/tests/src/android/opengl/cts/CompressedTextureStubActivity.java
new file mode 100644
index 0000000..bf098eb
--- /dev/null
+++ b/tests/src/android/opengl/cts/CompressedTextureStubActivity.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.opengl.cts;
+
+import com.android.cts.stub.R;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.util.Log;
+
+
+public class CompressedTextureStubActivity extends Activity {
+
+ private static final String TAG = "CompressedTextureStubActivity";
+
+ protected Resources mResources;
+
+ private CompressedTextureSurfaceView mCompressedTextureView = null;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Bundle extras = getIntent().getExtras();
+ String formatTest = extras.getString("TextureFormat", null);
+
+ Log.i(TAG, "Testing format " + formatTest);
+
+ mResources = getResources();
+
+ CompressedTextureLoader.Texture compressed = null;
+
+ BitmapFactory.Options optionsRGB = new BitmapFactory.Options();
+ optionsRGB.inPreferredConfig = Bitmap.Config.RGB_565;
+ Bitmap bitmap = BitmapFactory.decodeResource(mResources, R.raw.basetex, optionsRGB);
+
+ if (formatTest.equals(CompressedTextureLoader.TEXTURE_ETC1)) {
+ compressed = CompressedTextureLoader.createFromUncompressedETC1(bitmap);
+ } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_S3TC)) {
+ compressed = CompressedTextureLoader.loadTextureDXT(mResources, R.raw.ddstex); //stub for now
+ } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_ATC)) {
+ compressed = CompressedTextureLoader.loadTextureATC(mResources, 0); //stub for now
+ } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_PVRTC)) {
+ compressed = CompressedTextureLoader.loadTexturePVRTC(mResources, R.raw.pvrtex);
+ }
+
+ mCompressedTextureView = new CompressedTextureSurfaceView(this, bitmap, compressed);
+ setContentView(mCompressedTextureView);
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mCompressedTextureView.onResume();
+ }
+}
diff --git a/tests/src/android/opengl/cts/CompressedTextureSurfaceView.java b/tests/src/android/opengl/cts/CompressedTextureSurfaceView.java
new file mode 100644
index 0000000..8d28efa
--- /dev/null
+++ b/tests/src/android/opengl/cts/CompressedTextureSurfaceView.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import java.io.IOException;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import com.android.cts.stub.R;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.SurfaceTexture;
+import android.opengl.ETC1;
+import android.opengl.ETC1Util;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.opengl.GLUtils;
+import android.opengl.Matrix;
+import android.util.Log;
+import android.view.Surface;
+
+class CompressedTextureSurfaceView extends GLSurfaceView {
+ private static final String TAG = "CompressedTextureSurfaceView";
+ private static final int SLEEP_TIME_MS = 1000;
+
+ CompressedTextureRender mRenderer;
+
+ public CompressedTextureSurfaceView(Context context,
+ Bitmap base,
+ CompressedTextureLoader.Texture compressed) {
+ super(context);
+
+ setEGLContextClientVersion(2);
+ mRenderer = new CompressedTextureRender(context, base, compressed);
+ setRenderer(mRenderer);
+ setRenderMode(RENDERMODE_WHEN_DIRTY);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ }
+
+ private static class CompressedTextureRender implements GLSurfaceView.Renderer {
+ private static String TAG = "CompressedTextureRender";
+
+ private static final int ALLOWED_DELTA = 25;
+ private static final int FBO_PIXEL_SIZE_BYTES = 4;
+ private static final int FLOAT_SIZE_BYTES = 4;
+ private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
+ private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
+ private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
+ private final float[] mTriangleVerticesData = {
+ // X, Y, Z, U, V
+ -1.0f, -1.0f, 0, 0.f, 0.f,
+ 1.0f, -1.0f, 0, 1.f, 0.f,
+ -1.0f, 1.0f, 0, 0.f, 1.f,
+ 1.0f, 1.0f, 0, 1.f, 1.f,
+ };
+
+ private FloatBuffer mTriangleVertices;
+
+ private final String mVertexShader =
+ "uniform mat4 uMVPMatrix;\n" +
+ "attribute vec4 aPosition;\n" +
+ "attribute vec4 aTextureCoord;\n" +
+ "varying vec2 vTextureCoord;\n" +
+ "void main() {\n" +
+ " gl_Position = uMVPMatrix * aPosition;\n" +
+ " vTextureCoord = aTextureCoord.xy;\n" +
+ "}\n";
+
+ private final String mFragmentShader =
+ "precision mediump float;\n" +
+ "varying vec2 vTextureCoord;\n" +
+ "uniform sampler2D sTexture;\n" +
+ "void main() {\n" +
+ " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
+ "}\n";
+
+ private float[] mMVPMatrix = new float[16];
+ private float[] mSTMatrix = new float[16];
+
+ private int mProgram;
+ private int mTextureID;
+ private int muMVPMatrixHandle;
+ private int maPositionHandle;
+ private int maTextureHandle;
+ private int msTextureHandle;
+
+ private int mColorTargetID;
+ private int mFrameBufferObjectID;
+
+ private boolean updateSurface = false;
+
+ Bitmap mBaseTexture;
+ CompressedTextureLoader.Texture mCompressedTexture;
+
+ int mWidth;
+ int mHeight;
+
+ ByteBuffer mReadBackBuffer;
+
+ public CompressedTextureRender(Context context,
+ Bitmap base,
+ CompressedTextureLoader.Texture compressed) {
+ mBaseTexture = base;
+ mCompressedTexture = compressed;
+ mTriangleVertices = ByteBuffer.allocateDirect(
+ mTriangleVerticesData.length * FLOAT_SIZE_BYTES)
+ .order(ByteOrder.nativeOrder()).asFloatBuffer();
+ mTriangleVertices.put(mTriangleVerticesData).position(0);
+
+ Matrix.setIdentityM(mSTMatrix, 0);
+
+ int byteBufferSize = mBaseTexture.getWidth() *
+ mBaseTexture.getHeight() *
+ FBO_PIXEL_SIZE_BYTES;
+ mReadBackBuffer = ByteBuffer.allocateDirect(byteBufferSize);
+ }
+
+ private void renderQuad(int textureID) {
+ GLES20.glUseProgram(mProgram);
+ checkGlError("glUseProgram");
+
+ GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+ GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureID);
+
+ mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
+ GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
+ TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+ checkGlError("glVertexAttribPointer maPosition");
+ GLES20.glEnableVertexAttribArray(maPositionHandle);
+ checkGlError("glEnableVertexAttribArray maPositionHandle");
+
+ mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
+ GLES20.glVertexAttribPointer(maTextureHandle, 3, GLES20.GL_FLOAT, false,
+ TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+ checkGlError("glVertexAttribPointer maTextureHandle");
+ GLES20.glEnableVertexAttribArray(maTextureHandle);
+ checkGlError("glEnableVertexAttribArray maTextureHandle");
+
+ Matrix.setIdentityM(mMVPMatrix, 0);
+ GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
+
+ GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
+ checkGlError("glDrawArrays");
+ }
+
+ private int getUnsignedByte(byte val) {
+ return 0xFF & ((int)val);
+ }
+
+ private boolean comparePixel(int x, int y) {
+ int w = mBaseTexture.getWidth();
+ int sampleStart = (y * w + x) * FBO_PIXEL_SIZE_BYTES;
+
+ int R = getUnsignedByte(mReadBackBuffer.get(sampleStart));
+ int G = getUnsignedByte(mReadBackBuffer.get(sampleStart + 1));
+ int B = getUnsignedByte(mReadBackBuffer.get(sampleStart + 2));
+
+ int original = mBaseTexture.getPixel(x, y);
+
+ int deltaR = Math.abs(R - Color.red(original));
+ int deltaG = Math.abs(G - Color.green(original));
+ int deltaB = Math.abs(B - Color.blue(original));
+
+ if (deltaR <= ALLOWED_DELTA &&
+ deltaG <= ALLOWED_DELTA &&
+ deltaB <= ALLOWED_DELTA) {
+ return true;
+ }
+
+ Log.i("PIXEL DELTA", "R: " + deltaR + " G: " + deltaG + " B: " + deltaB);
+
+ return false;
+ }
+
+ private void comparePixels() {
+ int w = mBaseTexture.getWidth();
+ int h = mBaseTexture.getWidth();
+ int wOver4 = w / 4;
+ int hOver4 = h / 4;
+
+ // Sample 4 points in the image. Test is designed so that
+ // sample areas are low frequency and easy to compare
+ boolean sample1Matches = comparePixel(wOver4, hOver4);
+ boolean sample2Matches = comparePixel(wOver4 * 3, hOver4);
+ boolean sample3Matches = comparePixel(wOver4, hOver4 * 3);
+ boolean sample4Matches = comparePixel(wOver4 * 3, hOver4 * 3);
+
+ if (!sample1Matches || !sample2Matches || !sample3Matches || !sample4Matches) {
+ throw new RuntimeException("Compressed colors incorrect");
+ }
+ }
+
+ public void onDrawFrame(GL10 glUnused) {
+ if (mProgram == 0) {
+ return;
+ }
+
+ GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBufferObjectID);
+ GLES20.glViewport(0, 0, mBaseTexture.getWidth(), mBaseTexture.getHeight());
+ GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+ renderQuad(mTextureID);
+ GLES20.glReadPixels(0, 0, mBaseTexture.getWidth(), mBaseTexture.getHeight(),
+ GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mReadBackBuffer);
+ comparePixels();
+ GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
+
+ GLES20.glViewport(0, 0, mWidth, mHeight);
+ GLES20.glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
+ GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
+
+ renderQuad(mColorTargetID);
+
+ GLES20.glFinish();
+ }
+
+ public void onSurfaceChanged(GL10 glUnused, int width, int height) {
+ mWidth = width;
+ mHeight = height;
+ }
+
+ private void setupSamplers() {
+ GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
+ GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
+ GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
+ GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
+ GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
+ GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
+ GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
+ GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
+ }
+
+ private void initFBO() {
+ int[] textures = new int[1];
+ GLES20.glGenTextures(1, textures, 0);
+
+ mColorTargetID = textures[0];
+ GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mColorTargetID);
+ checkGlError("glBindTexture mColorTargetID");
+ setupSamplers();
+ GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA,
+ mBaseTexture.getWidth(), mBaseTexture.getHeight(), 0,
+ GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
+ checkGlError("glTexImage2D mColorTargetID");
+
+ GLES20.glGenFramebuffers(1, textures, 0);
+ mFrameBufferObjectID = textures[0];
+ GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBufferObjectID);
+
+ GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0,
+ GLES20.GL_TEXTURE_2D, mColorTargetID, 0);
+
+ int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
+ if(status != GLES20.GL_FRAMEBUFFER_COMPLETE) {
+ throw new RuntimeException("Failed to initialize framebuffer object");
+ }
+
+ GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
+ }
+
+ public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+ if (mCompressedTexture != null && !mCompressedTexture.isSupported()) {
+ return;
+ }
+
+ initFBO();
+
+ mProgram = createProgram(mVertexShader, mFragmentShader);
+ if (mProgram == 0) {
+ return;
+ }
+ maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
+ checkGlError("glGetAttribLocation aPosition");
+ if (maPositionHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for aPosition");
+ }
+ maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
+ checkGlError("glGetAttribLocation aTextureCoord");
+ if (maTextureHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for aTextureCoord");
+ }
+
+ muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
+ checkGlError("glGetUniformLocation uMVPMatrix");
+ if (muMVPMatrixHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for uMVPMatrix");
+ }
+
+ int[] textures = new int[1];
+ GLES20.glGenTextures(1, textures, 0);
+
+ mTextureID = textures[0];
+ GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
+ checkGlError("glBindTexture mTextureID");
+ setupSamplers();
+
+ if (mCompressedTexture == null) {
+ GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, mBaseTexture, 0);
+ checkGlError("texImage2D mBaseTexture");
+ } else {
+ GLES20.glCompressedTexImage2D(GLES20.GL_TEXTURE_2D,
+ 0,
+ mCompressedTexture.getFormat(),
+ mCompressedTexture.getWidth(),
+ mCompressedTexture.getHeight(),
+ 0,
+ mCompressedTexture.getData().remaining(),
+ mCompressedTexture.getData());
+ checkGlError("glCompressedTexImage2D mTextureID");
+ }
+ }
+
+ synchronized public void onFrameAvailable(SurfaceTexture surface) {
+ updateSurface = true;
+ }
+
+ private int loadShader(int shaderType, String source) {
+ int shader = GLES20.glCreateShader(shaderType);
+ if (shader != 0) {
+ GLES20.glShaderSource(shader, source);
+ GLES20.glCompileShader(shader);
+ int[] compiled = new int[1];
+ GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
+ if (compiled[0] == 0) {
+ Log.e(TAG, "Could not compile shader " + shaderType + ":");
+ Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
+ GLES20.glDeleteShader(shader);
+ shader = 0;
+ }
+ }
+ return shader;
+ }
+
+ private int createProgram(String vertexSource, String fragmentSource) {
+ int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
+ if (vertexShader == 0) {
+ return 0;
+ }
+ int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
+ if (pixelShader == 0) {
+ return 0;
+ }
+
+ int program = GLES20.glCreateProgram();
+ if (program != 0) {
+ GLES20.glAttachShader(program, vertexShader);
+ checkGlError("glAttachShader");
+ GLES20.glAttachShader(program, pixelShader);
+ checkGlError("glAttachShader");
+ GLES20.glLinkProgram(program);
+ int[] linkStatus = new int[1];
+ GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
+ if (linkStatus[0] != GLES20.GL_TRUE) {
+ Log.e(TAG, "Could not link program: ");
+ Log.e(TAG, GLES20.glGetProgramInfoLog(program));
+ GLES20.glDeleteProgram(program);
+ program = 0;
+ }
+ }
+ return program;
+ }
+
+ private void checkGlError(String op) {
+ int error;
+ while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+ Log.e(TAG, op + ": glError " + error);
+ throw new RuntimeException(op + ": glError " + error);
+ }
+ }
+
+ } // End of class CompressedTextureRender.
+
+} // End of class CompressedTextureSurfaceView.
diff --git a/tests/src/android/os/cts/FileUtils.java b/tests/src/android/os/cts/FileUtils.java
index feaf7d7..6b71b86 100644
--- a/tests/src/android/os/cts/FileUtils.java
+++ b/tests/src/android/os/cts/FileUtils.java
@@ -16,6 +16,7 @@
package android.os.cts;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -119,4 +120,33 @@
return false;
}
}
+
+ public static void createFile(File file, int numBytes) throws IOException {
+ File parentFile = file.getParentFile();
+ if (parentFile != null) {
+ parentFile.mkdirs();
+ }
+ byte[] buffer = new byte[numBytes];
+ FileOutputStream output = new FileOutputStream(file);
+ try {
+ output.write(buffer);
+ } finally {
+ output.close();
+ }
+ }
+
+ public static byte[] readInputStreamFully(InputStream is) {
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ byte[] buffer = new byte[32768];
+ int count;
+ try {
+ while ((count = is.read(buffer)) != -1) {
+ os.write(buffer, 0, count);
+ }
+ is.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return os.toByteArray();
+ }
}
diff --git a/tests/src/android/provider/cts/FileCopyHelper.java b/tests/src/android/provider/cts/FileCopyHelper.java
index 114c3ad..507eb06 100644
--- a/tests/src/android/provider/cts/FileCopyHelper.java
+++ b/tests/src/android/provider/cts/FileCopyHelper.java
@@ -19,7 +19,6 @@
import android.content.Context;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -98,18 +97,4 @@
mContext.deleteFile(path);
}
}
-
- public static void createFile(File file, int numBytes) throws IOException {
- File parentFile = file.getParentFile();
- if (parentFile != null) {
- parentFile.mkdirs();
- }
- byte[] buffer = new byte[numBytes];
- FileOutputStream output = new FileOutputStream(file);
- try {
- output.write(buffer);
- } finally {
- output.close();
- }
- }
}
diff --git a/tests/src/android/provider/cts/PhotoUtil.java b/tests/src/android/provider/cts/PhotoUtil.java
new file mode 100644
index 0000000..9c3047f
--- /dev/null
+++ b/tests/src/android/provider/cts/PhotoUtil.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.provider.cts;
+
+import com.android.cts.stub.R;
+
+import android.content.Context;
+import android.os.cts.FileUtils;
+
+import java.io.InputStream;
+
+public class PhotoUtil {
+
+ public static byte[] getTestPhotoData(Context context) {
+ InputStream input = context.getResources().openRawResource(R.drawable.testimage);
+ return FileUtils.readInputStreamFully(input);
+ }
+}
diff --git a/tests/src/android/view/animation/cts/AnimationTestUtils.java b/tests/src/android/view/animation/cts/AnimationTestUtils.java
index 3ee22c7..a2b786d 100644
--- a/tests/src/android/view/animation/cts/AnimationTestUtils.java
+++ b/tests/src/android/view/animation/cts/AnimationTestUtils.java
@@ -17,6 +17,7 @@
package android.view.animation.cts;
import android.app.Instrumentation;
+import android.cts.util.PollingCheck;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
@@ -66,7 +67,7 @@
});
// check whether it has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return animation.hasStarted();
@@ -74,7 +75,7 @@
}.run();
// check whether it has ended after duration
- new DelayedCheck(duration + TIMEOUT_DELTA) {
+ new PollingCheck(duration + TIMEOUT_DELTA) {
@Override
protected boolean check() {
return animation.hasEnded();
diff --git a/tests/src/android/view/animation/cts/DelayedCheck.java b/tests/src/android/view/animation/cts/DelayedCheck.java
deleted file mode 100644
index 7179426..0000000
--- a/tests/src/android/view/animation/cts/DelayedCheck.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.view.animation.cts;
-
-import junit.framework.Assert;
-
-public abstract class DelayedCheck {
- private static final long TIME_SLICE = 200;
- private long mTimeout = 3000;
-
- public DelayedCheck() {
-
- }
-
- public DelayedCheck(long timeout) {
- mTimeout = timeout;
- }
-
- protected abstract boolean check();
-
- public void run() {
- long timeout = mTimeout;
- while (timeout > 0) {
- try {
- Thread.sleep(TIME_SLICE);
- } catch (InterruptedException e) {
- Assert.fail("unexpected InterruptedException");
- }
-
- if (check()) {
- return;
- }
-
- timeout -= TIME_SLICE;
- }
-
- Assert.fail("unexpected timeout");
- }
-}
diff --git a/tests/src/android/webkit/cts/CtsTestServer.java b/tests/src/android/webkit/cts/CtsTestServer.java
index 6d3bfe6..b0d20ba 100755
--- a/tests/src/android/webkit/cts/CtsTestServer.java
+++ b/tests/src/android/webkit/cts/CtsTestServer.java
@@ -39,6 +39,7 @@
import android.content.Context;
import android.content.res.AssetManager;
+import android.content.res.Resources;
import android.net.Uri;
import android.os.Environment;
import android.util.Log;
@@ -95,6 +96,7 @@
private static final String NUM_BYTES_PARAMETER = "numBytes";
public static final String ASSET_PREFIX = "/assets/";
+ public static final String RAW_PREFIX = "raw/";
public static final String FAVICON_ASSET_PATH = ASSET_PREFIX + "webkit/favicon.png";
public static final String APPCACHE_PATH = "/appcache.html";
public static final String APPCACHE_MANIFEST_PATH = "/appcache.manifest";
@@ -124,6 +126,7 @@
private String mServerUri;
private AssetManager mAssets;
private Context mContext;
+ private Resources mResources;
private boolean mSsl;
private MimeTypeMap mMap;
private String mLastQuery;
@@ -166,6 +169,7 @@
sInstance = this;
mContext = context;
mAssets = mContext.getAssets();
+ mResources = mContext.getResources();
mSsl = ssl;
if (mSsl) {
mServerUri = "https://localhost:" + SSL_SERVER_PORT;
@@ -482,7 +486,18 @@
path = path.substring(ASSET_PREFIX.length());
// request for an asset file
try {
- InputStream in = mAssets.open(path);
+ InputStream in;
+ if (path.startsWith(RAW_PREFIX)) {
+ String resourceName = path.substring(RAW_PREFIX.length());
+ int id = mResources.getIdentifier(resourceName, "raw", mContext.getPackageName());
+ if (id == 0) {
+ Log.w(TAG, "Can't find raw resource " + resourceName);
+ throw new IOException();
+ }
+ in = mResources.openRawResource(id);
+ } else {
+ in = mAssets.open(path);
+ }
response = createResponse(HttpStatus.SC_OK);
InputStreamEntity entity = new InputStreamEntity(in, in.available());
String mimeType =
@@ -554,15 +569,20 @@
" <head>" +
" <title>Waiting</title>" +
" <script>" +
- " function updateTitle() { document.title = \"Done\"; }" +
- " window.applicationCache.onnoupdate = updateTitle;" +
- " window.applicationCache.oncached = updateTitle;" +
- " window.applicationCache.onupdateready = updateTitle;" +
- " window.applicationCache.onobsolete = updateTitle;" +
- " window.applicationCache.onerror = updateTitle;" +
+ " function updateTitle(x) { document.title = x; }" +
+ " window.applicationCache.onnoupdate = " +
+ " function() { updateTitle(\"onnoupdate Callback\"); };" +
+ " window.applicationCache.oncached = " +
+ " function() { updateTitle(\"oncached Callback\"); };" +
+ " window.applicationCache.onupdateready = " +
+ " function() { updateTitle(\"onupdateready Callback\"); };" +
+ " window.applicationCache.onobsolete = " +
+ " function() { updateTitle(\"onobsolete Callback\"); };" +
+ " window.applicationCache.onerror = " +
+ " function() { updateTitle(\"onerror Callback\"); };" +
" </script>" +
" </head>" +
- " <body>AppCache test</body>" +
+ " <body onload=\"updateTitle('Loaded');\">AppCache test</body>" +
"</html>"));
} else if (path.equals(APPCACHE_MANIFEST_PATH)) {
response = createResponse(HttpStatus.SC_OK);
@@ -675,6 +695,10 @@
}
}
+ protected DefaultHttpServerConnection createHttpServerConnection() {
+ return new DefaultHttpServerConnection();
+ }
+
private static class ServerThread extends Thread {
private CtsTestServer mServer;
private ServerSocket mSocket;
@@ -767,7 +791,7 @@
try {
Socket socket = mSocket.accept();
- DefaultHttpServerConnection conn = new DefaultHttpServerConnection();
+ DefaultHttpServerConnection conn = mServer.createHttpServerConnection();
HttpParams params = new BasicHttpParams();
params.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_0);
conn.bind(socket, params);
diff --git a/tests/src/android/webkit/cts/WebViewOnUiThread.java b/tests/src/android/webkit/cts/WebViewOnUiThread.java
new file mode 100644
index 0000000..c9dc914
--- /dev/null
+++ b/tests/src/android/webkit/cts/WebViewOnUiThread.java
@@ -0,0 +1,784 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.webkit.cts;
+
+import android.cts.util.PollingCheck;
+import android.graphics.Bitmap;
+import android.graphics.Picture;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.Looper;
+import android.os.Message;
+import android.os.SystemClock;
+import android.test.InstrumentationTestCase;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.webkit.DownloadListener;
+import android.webkit.WebBackForwardList;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebView.HitTestResult;
+import android.webkit.WebView.PictureListener;
+import android.webkit.WebViewClient;
+
+import junit.framework.Assert;
+
+import java.io.File;
+
+
+/**
+ * Many tests need to run WebView code in the UI thread. This class
+ * wraps a WebView so that calls are ensured to arrive on the UI thread.
+ *
+ * All methods may be run on either the UI thread or test thread.
+ */
+public class WebViewOnUiThread {
+ /**
+ * The maximum time, in milliseconds (10 seconds) to wait for a load
+ * to be triggered.
+ */
+ private static final long LOAD_TIMEOUT = 10000;
+
+ /**
+ * Set to true after onPageFinished is called.
+ */
+ private boolean mLoaded;
+
+ /**
+ * Set to true after onNewPicture is called. Reset when onPageStarted
+ * is called.
+ */
+ private boolean mNewPicture;
+
+ /**
+ * The progress, in percentage, of the page load. Valid values are between
+ * 0 and 100.
+ */
+ private int mProgress;
+
+ /**
+ * The test that this class is being used in. Used for runTestOnUiThread.
+ */
+ private InstrumentationTestCase mTest;
+
+ /**
+ * The WebView that calls will be made on.
+ */
+ private WebView mWebView;
+
+ /**
+ * Initializes the webView with a WebViewClient, WebChromeClient,
+ * and PictureListener to prepare for loadUrlAndWaitForCompletion.
+ *
+ * A new WebViewOnUiThread should be called during setUp so as to
+ * reinitialize between calls.
+ *
+ * @param test The test in which this is being run.
+ * @param webView The webView that the methods should call.
+ * @see loadUrlAndWaitForCompletion
+ */
+ public WebViewOnUiThread(InstrumentationTestCase test, WebView webView) {
+ mTest = test;
+ mWebView = webView;
+ final WebViewClient webViewClient = new WaitForLoadedClient(this);
+ final WebChromeClient webChromeClient = new WaitForProgressClient(this);
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setWebViewClient(webViewClient);
+ mWebView.setWebChromeClient(webChromeClient);
+ mWebView.setPictureListener(new WaitForNewPicture());
+ }
+ });
+ }
+
+ /**
+ * Called from WaitForNewPicture, this is used to indicate that
+ * the page has been drawn.
+ */
+ synchronized public void onNewPicture() {
+ mNewPicture = true;
+ this.notifyAll();
+ }
+
+ /**
+ * Called from WaitForLoadedClient, this is used to clear the picture
+ * draw state so that draws before the URL begins loading don't count.
+ */
+ synchronized public void onPageStarted() {
+ mNewPicture = false; // Earlier paints won't count.
+ }
+
+ /**
+ * Called from WaitForLoadedClient, this is used to indicate that
+ * the page is loaded, but not drawn yet.
+ */
+ synchronized public void onPageFinished() {
+ mLoaded = true;
+ this.notifyAll();
+ }
+
+ /**
+ * Called from the WebChrome client, this sets the current progress
+ * for a page.
+ * @param progress The progress made so far between 0 and 100.
+ */
+ synchronized public void onProgressChanged(int progress) {
+ mProgress = progress;
+ this.notifyAll();
+ }
+
+ public void setWebViewClient(final WebViewClient webViewClient) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setWebViewClient(webViewClient);
+ }
+ });
+ }
+
+ public void setWebChromeClient(final WebChromeClient webChromeClient) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setWebChromeClient(webChromeClient);
+ }
+ });
+ }
+
+ public void setPictureListener(final PictureListener pictureListener) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setPictureListener(pictureListener);
+ }
+ });
+ }
+
+ public void setDownloadListener(final DownloadListener listener) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setDownloadListener(listener);
+ }
+ });
+ }
+
+ public void setBackgroundColor(final int color) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setBackgroundColor(color);
+ }
+ });
+ }
+
+ public void clearCache(final boolean includeDiskFiles) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.clearCache(includeDiskFiles);
+ }
+ });
+ }
+
+ public void clearHistory() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.clearHistory();
+ }
+ });
+ }
+
+ public void requestFocus() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.requestFocus();
+ }
+ });
+ }
+
+ public void zoomIn() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.zoomIn();
+ }
+ });
+ }
+
+ public void removeJavascriptInterface(final String interfaceName) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.removeJavascriptInterface(interfaceName);
+ }
+ });
+ }
+
+ public void addJavascriptInterface(final Object object, final String name) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.addJavascriptInterface(object, name);
+ }
+ });
+ }
+
+ public void flingScroll(final int vx, final int vy) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.flingScroll(vx, vy);
+ }
+ });
+ }
+
+ public void requestFocusNodeHref(final Message hrefMsg) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.requestFocusNodeHref(hrefMsg);
+ }
+ });
+ }
+
+ public void requestImageRef(final Message msg) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.requestImageRef(msg);
+ }
+ });
+ }
+
+ public void setInitialScale(final int scaleInPercent) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.setInitialScale(scaleInPercent);
+ }
+ });
+ }
+
+ public void clearSslPreferences() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.clearSslPreferences();
+ }
+ });
+ }
+
+ public void resumeTimers() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.resumeTimers();
+ }
+ });
+ }
+
+ public void findNext(final boolean forward) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.findNext(forward);
+ }
+ });
+ }
+
+ public void clearMatches() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.clearMatches();
+ }
+ });
+ }
+
+ /**
+ * Calls loadUrl on the WebView and then waits onPageFinished,
+ * onNewPicture and onProgressChange to reach 100.
+ * Test fails if the load timeout elapses.
+ * @param url The URL to load.
+ */
+ public void loadUrlAndWaitForCompletion(final String url) {
+ callAndWait(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.loadUrl(url);
+ }
+ });
+ }
+
+ public void loadDataAndWaitForCompletion(final String data,
+ final String mimeType, final String encoding) {
+ callAndWait(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.loadData(data, mimeType, encoding);
+ }
+ });
+ }
+
+ public void loadDataWithBaseURLAndWaitForCompletion(final String baseUrl,
+ final String data, final String mimeType, final String encoding,
+ final String historyUrl) {
+ callAndWait(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding,
+ historyUrl);
+ }
+ });
+ }
+
+ /**
+ * Reloads a page and waits for it to complete reloading. Use reload
+ * if it is a form resubmission and the onFormResubmission responds
+ * by telling WebView not to resubmit it.
+ */
+ public void reloadAndWaitForCompletion() {
+ callAndWait(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.reload();
+ }
+ });
+ }
+
+ /**
+ * Reload the previous URL. Use reloadAndWaitForCompletion unless
+ * it is a form resubmission and the onFormResubmission responds
+ * by telling WebView not to resubmit it.
+ */
+ public void reload() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.reload();
+ }
+ });
+ }
+
+ /**
+ * Use this only when JavaScript causes a page load to wait for the
+ * page load to complete. Otherwise use loadUrlAndWaitForCompletion or
+ * similar functions.
+ */
+ public void waitForLoadCompletion() {
+ if (isUiThread()) {
+ waitOnUiThread();
+ } else {
+ waitOnTestThread();
+ }
+ clearLoad();
+ }
+
+ public String getTitle() {
+ return getValue(new ValueGetter<String>() {
+ @Override
+ public String capture() {
+ return mWebView.getTitle();
+ }
+ });
+ }
+
+ public WebSettings getSettings() {
+ return getValue(new ValueGetter<WebSettings>() {
+ @Override
+ public WebSettings capture() {
+ return mWebView.getSettings();
+ }
+ });
+ }
+
+ public WebBackForwardList copyBackForwardList() {
+ return getValue(new ValueGetter<WebBackForwardList>() {
+ @Override
+ public WebBackForwardList capture() {
+ return mWebView.copyBackForwardList();
+ }
+ });
+ }
+
+ public Bitmap getFavicon() {
+ return getValue(new ValueGetter<Bitmap>() {
+ @Override
+ public Bitmap capture() {
+ return mWebView.getFavicon();
+ }
+ });
+ }
+
+ public String getUrl() {
+ return getValue(new ValueGetter<String>() {
+ @Override
+ public String capture() {
+ return mWebView.getUrl();
+ }
+ });
+ }
+
+ public int getProgress() {
+ return getValue(new ValueGetter<Integer>() {
+ @Override
+ public Integer capture() {
+ return mWebView.getProgress();
+ }
+ });
+ }
+
+ public int getHeight() {
+ return getValue(new ValueGetter<Integer>() {
+ @Override
+ public Integer capture() {
+ return mWebView.getHeight();
+ }
+ });
+ }
+
+ public int getContentHeight() {
+ return getValue(new ValueGetter<Integer>() {
+ @Override
+ public Integer capture() {
+ return mWebView.getContentHeight();
+ }
+ });
+ }
+
+ public boolean savePicture(final Bundle b, final File dest) {
+ return getValue(new ValueGetter<Boolean>() {
+ @Override
+ public Boolean capture() {
+ return mWebView.savePicture(b, dest);
+ }
+ });
+ }
+
+ public boolean pageUp(final boolean top) {
+ return getValue(new ValueGetter<Boolean>() {
+ @Override
+ public Boolean capture() {
+ return mWebView.pageUp(top);
+ }
+ });
+ }
+
+ public boolean pageDown(final boolean bottom) {
+ return getValue(new ValueGetter<Boolean>() {
+ @Override
+ public Boolean capture() {
+ return mWebView.pageDown(bottom);
+ }
+ });
+ }
+
+ public int[] getLocationOnScreen() {
+ final int[] location = new int[2];
+ return getValue(new ValueGetter<int[]>() {
+ @Override
+ public int[] capture() {
+ mWebView.getLocationOnScreen(location);
+ return location;
+ }
+ });
+ }
+
+ public float getScale() {
+ return getValue(new ValueGetter<Float>() {
+ @Override
+ public Float capture() {
+ return mWebView.getScale();
+ }
+ });
+ }
+
+ public boolean requestFocus(final int direction,
+ final Rect previouslyFocusedRect) {
+ return getValue(new ValueGetter<Boolean>() {
+ @Override
+ public Boolean capture() {
+ return mWebView.requestFocus(direction, previouslyFocusedRect);
+ }
+ });
+ }
+
+ public HitTestResult getHitTestResult() {
+ return getValue(new ValueGetter<HitTestResult>() {
+ @Override
+ public HitTestResult capture() {
+ return mWebView.getHitTestResult();
+ }
+ });
+ }
+
+ public int getScrollX() {
+ return getValue(new ValueGetter<Integer>() {
+ @Override
+ public Integer capture() {
+ return mWebView.getScrollX();
+ }
+ });
+ }
+
+ public int getScrollY() {
+ return getValue(new ValueGetter<Integer>() {
+ @Override
+ public Integer capture() {
+ return mWebView.getScrollY();
+ }
+ });
+ }
+
+ public final DisplayMetrics getDisplayMetrics() {
+ return getValue(new ValueGetter<DisplayMetrics>() {
+ @Override
+ public DisplayMetrics capture() {
+ return mWebView.getContext().getResources().getDisplayMetrics();
+ }
+ });
+ }
+
+ public boolean requestChildRectangleOnScreen(final View child,
+ final Rect rect,
+ final boolean immediate) {
+ return getValue(new ValueGetter<Boolean>() {
+ @Override
+ public Boolean capture() {
+ return mWebView.requestChildRectangleOnScreen(child, rect,
+ immediate);
+ }
+ });
+ }
+
+ public int findAll(final String find) {
+ return getValue(new ValueGetter<Integer>() {
+ @Override
+ public Integer capture() {
+ return mWebView.findAll(find);
+ }
+ });
+ }
+
+ /**
+ * Helper for running code on the UI thread where an exception is
+ * a test failure. If this is already the UI thread then it runs
+ * the code immediately.
+ *
+ * @see runTestOnUiThread
+ * @param r The code to run in the UI thread
+ */
+ public void runOnUiThread(Runnable r) {
+ try {
+ if (isUiThread()) {
+ r.run();
+ } else {
+ mTest.runTestOnUiThread(r);
+ }
+ } catch (Throwable t) {
+ Assert.fail("Unexpected error while running on UI thread: "
+ + t.getMessage());
+ }
+ }
+
+ /**
+ * Accessor for underlying WebView.
+ * @return The WebView being wrapped by this class.
+ */
+ public WebView getWebView() {
+ return mWebView;
+ }
+
+ private <T> T getValue(ValueGetter<T> getter) {
+ runOnUiThread(getter);
+ return getter.getValue();
+ }
+
+ private abstract class ValueGetter<T> implements Runnable {
+ private T mValue;
+
+ @Override
+ public void run() {
+ mValue = capture();
+ }
+
+ protected abstract T capture();
+
+ public T getValue() {
+ return mValue;
+ }
+ }
+
+ /**
+ * Returns true if the current thread is the UI thread based on the
+ * Looper.
+ */
+ private static boolean isUiThread() {
+ return (Looper.myLooper() == Looper.getMainLooper());
+ }
+
+ /**
+ * @return Whether or not the load has finished.
+ */
+ private synchronized boolean isLoaded() {
+ return mLoaded && mNewPicture && mProgress == 100;
+ }
+
+ /**
+ * Makes a WebView call, waits for completion and then resets the
+ * load state in preparation for the next load call.
+ * @param call The call to make on the UI thread prior to waiting.
+ */
+ private void callAndWait(Runnable call) {
+ Assert.assertTrue("WebViewOnUiThread.load*AndWaitForCompletion calls "
+ + "may not be mixed with load* calls directly on WebView "
+ + "without calling waitForLoadCompletion after the load",
+ !mLoaded);
+ runOnUiThread(call);
+ waitForLoadCompletion();
+ }
+
+ /**
+ * Called whenever a load has been completed so that a subsequent call to
+ * waitForLoadCompletion doesn't return immediately.
+ */
+ synchronized private void clearLoad() {
+ mLoaded = false;
+ mNewPicture = false;
+ mProgress = 0;
+ }
+
+ /**
+ * Uses a polling mechanism, while pumping messages to check when the
+ * load completes.
+ */
+ private void waitOnUiThread() {
+ new PollingCheck(LOAD_TIMEOUT) {
+ @Override
+ protected boolean check() {
+ pumpMessages();
+ return isLoaded();
+ }
+ }.run();
+ }
+
+ /**
+ * Uses a wait/notify to check when the load completes.
+ */
+ private synchronized void waitOnTestThread() {
+ try {
+ long waitEnd = SystemClock.uptimeMillis() + LOAD_TIMEOUT;
+ long timeRemaining = LOAD_TIMEOUT;
+ while (!isLoaded() && timeRemaining > 0) {
+ this.wait(timeRemaining);
+ timeRemaining = waitEnd - SystemClock.uptimeMillis();
+ }
+ } catch (InterruptedException e) {
+ // We'll just drop out of the loop and fail
+ }
+ Assert.assertTrue("Load failed to complete before timeout", isLoaded());
+ }
+
+ /**
+ * Pumps all currently-queued messages in the UI thread and then exits.
+ * This is useful to force processing while running tests in the UI thread.
+ */
+ private void pumpMessages() {
+ class ExitLoopException extends RuntimeException {
+ }
+
+ // Force loop to exit when processing this. Loop.quit() doesn't
+ // work because this is the main Loop.
+ mWebView.getHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ throw new ExitLoopException(); // exit loop!
+ }
+ });
+ try {
+ // Pump messages until our message gets through.
+ Looper.loop();
+ } catch (ExitLoopException e) {
+ }
+ }
+
+ /**
+ * A WebChromeClient used to capture the onProgressChanged for use
+ * in waitFor functions. If a test must override the WebChromeClient,
+ * it can derive from this class or call onProgressChanged
+ * directly.
+ */
+ public static class WaitForProgressClient extends WebChromeClient {
+ private WebViewOnUiThread mOnUiThread;
+
+ public WaitForProgressClient(WebViewOnUiThread onUiThread) {
+ mOnUiThread = onUiThread;
+ }
+
+ @Override
+ public void onProgressChanged(WebView view, int newProgress) {
+ super.onProgressChanged(view, newProgress);
+ mOnUiThread.onProgressChanged(newProgress);
+ }
+ }
+
+ /**
+ * A WebViewClient that captures the onPageFinished for use in
+ * waitFor functions. Using initializeWebView sets the WaitForLoadedClient
+ * into the WebView. If a test needs to set a specific WebViewClient and
+ * needs the waitForCompletion capability then it should derive from
+ * WaitForLoadedClient or call WebViewOnUiThread.onPageFinished.
+ */
+ public static class WaitForLoadedClient extends WebViewClient {
+ private WebViewOnUiThread mOnUiThread;
+
+ public WaitForLoadedClient(WebViewOnUiThread onUiThread) {
+ mOnUiThread = onUiThread;
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ mOnUiThread.onPageFinished();
+ }
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+ super.onPageStarted(view, url, favicon);
+ mOnUiThread.onPageStarted();
+ }
+ }
+
+ /**
+ * A PictureListener that captures the onNewPicture for use in
+ * waitForLoadCompletion. Using initializeWebView sets the PictureListener
+ * into the WebView. If a test needs to set a specific PictureListener and
+ * needs the waitForCompletion capability then it should call
+ * WebViewOnUiThread.onNewPicture.
+ */
+ private class WaitForNewPicture implements PictureListener {
+ @Override
+ public void onNewPicture(WebView view, Picture picture) {
+ WebViewOnUiThread.this.onNewPicture();
+ }
+ }
+}
diff --git a/tests/tests/acceleration/Android.mk b/tests/tests/acceleration/Android.mk
index 3e2acac..93c4d51 100644
--- a/tests/tests/acceleration/Android.mk
+++ b/tests/tests/acceleration/Android.mk
@@ -30,4 +30,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/accessibilityservice/Android.mk b/tests/tests/accessibilityservice/Android.mk
index 71b7537..4cac305 100644
--- a/tests/tests/accessibilityservice/Android.mk
+++ b/tests/tests/accessibilityservice/Android.mk
@@ -34,4 +34,4 @@
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/accounts/Android.mk b/tests/tests/accounts/Android.mk
index d9e142b..2806bbe 100644
--- a/tests/tests/accounts/Android.mk
+++ b/tests/tests/accounts/Android.mk
@@ -29,5 +29,4 @@
LOCAL_PACKAGE_NAME := CtsAccountManagerTestCases
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/admin/Android.mk b/tests/tests/admin/Android.mk
index 3228d85..8c71e0c 100644
--- a/tests/tests/admin/Android.mk
+++ b/tests/tests/admin/Android.mk
@@ -30,4 +30,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk
index ed9874e..95cc614 100644
--- a/tests/tests/animation/Android.mk
+++ b/tests/tests/animation/Android.mk
@@ -30,5 +30,5 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/animation/AndroidManifest.xml b/tests/tests/animation/AndroidManifest.xml
index f3fd898..f18d416 100644
--- a/tests/tests/animation/AndroidManifest.xml
+++ b/tests/tests/animation/AndroidManifest.xml
@@ -16,10 +16,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.animation">
-
+ <uses-sdk android:minSdkVersion="11" />
+ <uses-permission android:name="android.permission.INJECT_EVENTS"></uses-permission>
<application>
<activity android:name="android.animation.cts.AnimationActivity"
android:label="AnimationActivity"/>
+ <activity
+ android:name="android.animation.cts.LayoutAnimationActivity" />
<uses-library android:name="android.test.runner" />
</application>
diff --git a/tests/tests/animation/res/layout/animation_main.xml b/tests/tests/animation/res/layout/animation_main.xml
index 81356a1..c1664f5 100644
--- a/tests/tests/animation/res/layout/animation_main.xml
+++ b/tests/tests/animation/res/layout/animation_main.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/tests/tests/animation/res/layout/animation_two.xml b/tests/tests/animation/res/layout/animation_two.xml
new file mode 100644
index 0000000..870cc6b
--- /dev/null
+++ b/tests/tests/animation/res/layout/animation_two.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+ <Button android:id="@+id/button1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/add_button"/>
+ <LinearLayout android:id="@+id/container"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/tests/tests/animation/res/values/strings.xml b/tests/tests/animation/res/values/strings.xml
new file mode 100644
index 0000000..8d167fd
--- /dev/null
+++ b/tests/tests/animation/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <string name="add_button">Add Button</string>
+</resources>
diff --git a/tests/tests/animation/src/android/animation/cts/AnimationActivity.java b/tests/tests/animation/src/android/animation/cts/AnimationActivity.java
index 43679c8..555ab15 100644
--- a/tests/tests/animation/src/android/animation/cts/AnimationActivity.java
+++ b/tests/tests/animation/src/android/animation/cts/AnimationActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@
}
public ValueAnimator createAnimatorWithInterpolator(TimeInterpolator interpolator){
- return createAnimator(view.newBall, "y", 1000, ValueAnimator.INFINITE, ValueAnimator.REVERSE,
- interpolator, mStartY, mStartY + mDeltaY);
+ return createAnimator(view.newBall, "y", 1000, ValueAnimator.INFINITE,
+ ValueAnimator.REVERSE, interpolator, mStartY, mStartY + mDeltaY);
}
public ValueAnimator createObjectAnimatorForInt(Object object,String propertyName,
@@ -140,29 +140,40 @@
bounceAnimator.setRepeatCount(ValueAnimator.INFINITE);
bounceAnimator.setInterpolator(new AccelerateInterpolator());
bounceAnimator.setRepeatMode(ValueAnimator.REVERSE);
- view.bounceAnimator = bounceAnimator;
+ view.bounceYAnimator = bounceAnimator;
view.startColorAnimator();
view.animateBall();
}
public void startAnimation(ValueAnimator valueAnimator){
- view.bounceAnimator = valueAnimator;
+ view.bounceYAnimator = valueAnimator;
+ view.startColorAnimator();
+ view.animateBall();
+ }
+
+ public void startAnimation(Animator animator){
+ view.bounceYAnimator = (ValueAnimator)animator;
view.startColorAnimator();
view.animateBall();
}
public void startAnimation(ObjectAnimator bounceAnimator) {
- view.bounceAnimator = bounceAnimator;
+ view.bounceYAnimator = bounceAnimator;
view.startColorAnimator();
view.animateBall();
}
public void startAnimation(ObjectAnimator bounceAnimator, ObjectAnimator colorAnimator) {
- view.bounceAnimator = bounceAnimator;
+ view.bounceYAnimator = bounceAnimator;
view.startColorAnimator(colorAnimator);
view.animateBall();
}
+ public void startAnimatorSet(AnimatorSet set){
+ view.startColorAnimator();
+ view.animateBall(set);
+ }
+
public void startColorAnimation(ValueAnimator colorAnimator){
view.startColorAnimator(colorAnimator);
}
@@ -173,7 +184,8 @@
public ShapeHolder newBall = null;
public final ArrayList<ShapeHolder> balls = new ArrayList<ShapeHolder>();
AnimatorSet animation = null;
- public ValueAnimator bounceAnimator;
+ public ValueAnimator bounceYAnimator;
+ public ValueAnimator bounceXAnimator;
public ValueAnimator colorAnimator;
public AnimationView(Context context) {
@@ -201,10 +213,8 @@
}
public void animateBall() {
- float startY = mStartY;
- float endY = startY + mDeltaY;
AnimatorSet bouncer = new AnimatorSet();
- bouncer.play(bounceAnimator);
+ bouncer.play(bounceYAnimator);
// Fading animation - remove the ball when the animation is done
ValueAnimator fadeAnim = ObjectAnimator.ofFloat(newBall, "alpha", 1f, 0f);
fadeAnim.setDuration(250);
@@ -221,6 +231,10 @@
animatorSet.start();
}
+ public void animateBall(AnimatorSet set) {
+ set.start();
+ }
+
private ShapeHolder addBall(float x, float y) {
OvalShape circle = new OvalShape();
circle.resize(x, y);
@@ -254,3 +268,4 @@
}
}
}
+
diff --git a/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java b/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java
new file mode 100644
index 0000000..35a0b4c
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.animation.cts;
+
+import java.util.ArrayList;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
+import android.test.ActivityInstrumentationTestCase2;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.AccelerateInterpolator;
+
+public class AnimatorSetTest extends
+ ActivityInstrumentationTestCase2<AnimationActivity> {
+ private AnimationActivity mActivity;
+ private AnimatorSet mAnimatorSet;
+ private long mDuration = 1000;
+ private Object object;
+ private ObjectAnimator yAnimator;
+ private ObjectAnimator xAnimator;
+
+ public AnimatorSetTest() {
+ super(AnimationActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ setActivityInitialTouchMode(false);
+ mActivity = getActivity();
+ object = mActivity.view.newBall;
+ yAnimator = getYAnimator(object);
+ xAnimator = getXAnimator(object);
+ }
+
+ public void testPlaySequentially() throws Throwable {
+ Animator[] animatorArray = {xAnimator, yAnimator};
+
+ mAnimatorSet = new AnimatorSet();
+ mAnimatorSet.playSequentially(animatorArray);
+
+ assertFalse(mAnimatorSet.isRunning());
+ startAnimation(mAnimatorSet);
+ Thread.sleep(100);
+ assertTrue(mAnimatorSet.isRunning());
+ }
+
+ public void testPlayTogether() throws Throwable {
+ xAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ Animator[] animatorArray = {xAnimator, yAnimator};
+
+ mAnimatorSet = new AnimatorSet();
+ mAnimatorSet.playTogether(animatorArray);
+
+ assertFalse(mAnimatorSet.isRunning());
+ startAnimation(mAnimatorSet);
+ Thread.sleep(100);
+ assertTrue(mAnimatorSet.isRunning());
+ }
+
+ public void testDuration() throws Throwable {
+ xAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ Animator[] animatorArray = { xAnimator, yAnimator };
+
+ mAnimatorSet = new AnimatorSet();
+ mAnimatorSet.playTogether(animatorArray);
+ mAnimatorSet.setDuration(1000);
+
+ startAnimation(mAnimatorSet);
+ Thread.sleep(100);
+ assertEquals(mAnimatorSet.getDuration(), 1000);
+ }
+
+ public void testStartDelay() throws Throwable {
+ xAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ Animator[] animatorArray = { xAnimator, yAnimator };
+
+ mAnimatorSet = new AnimatorSet();
+ mAnimatorSet.playTogether(animatorArray);
+ mAnimatorSet.setStartDelay(10);
+
+ startAnimation(mAnimatorSet);
+ Thread.sleep(100);
+ assertEquals(mAnimatorSet.getStartDelay(), 10);
+ }
+
+ public void testgetChildAnimations() throws Throwable {
+ Animator[] animatorArray = { xAnimator, yAnimator };
+
+ mAnimatorSet = new AnimatorSet();
+ ArrayList<Animator> childAnimations = mAnimatorSet.getChildAnimations();
+ assertEquals(0, mAnimatorSet.getChildAnimations().size());
+ mAnimatorSet.playSequentially(animatorArray);
+ assertEquals(2, mAnimatorSet.getChildAnimations().size());
+ }
+
+ public void testSetInterpolator() throws Throwable {
+ xAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ Animator[] animatorArray = {xAnimator, yAnimator};
+ TimeInterpolator interpolator = new AccelerateDecelerateInterpolator();
+ mAnimatorSet = new AnimatorSet();
+ mAnimatorSet.playTogether(animatorArray);
+ mAnimatorSet.setInterpolator(interpolator);
+
+ assertFalse(mAnimatorSet.isRunning());
+ startAnimation(mAnimatorSet);
+ Thread.sleep(100);
+
+ ArrayList<Animator> animatorList = mAnimatorSet.getChildAnimations();
+ assertEquals(interpolator, ((ObjectAnimator)animatorList.get(0)).getInterpolator());
+ assertEquals(interpolator, ((ObjectAnimator)animatorList.get(1)).getInterpolator());
+ }
+
+ public ObjectAnimator getXAnimator(Object object) {
+ String propertyX = "x";
+ float startX = mActivity.mStartX;
+ float endX = mActivity.mStartX + mActivity.mDeltaX;
+ ObjectAnimator xAnimator = ObjectAnimator.ofFloat(object, propertyX, startX, endX);
+ xAnimator.setDuration(mDuration);
+ xAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ xAnimator.setInterpolator(new AccelerateInterpolator());
+ xAnimator.setRepeatMode(ValueAnimator.REVERSE);
+ return xAnimator;
+ }
+
+ public ObjectAnimator getYAnimator(Object object) {
+ String property = "y";
+ float startY = mActivity.mStartY;
+ float endY = mActivity.mStartY + mActivity.mDeltaY;
+ ObjectAnimator yAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
+ yAnimator.setDuration(mDuration);
+ yAnimator.setRepeatCount(2);
+ yAnimator.setInterpolator(new AccelerateInterpolator());
+ yAnimator.setRepeatMode(ValueAnimator.REVERSE);
+ return yAnimator;
+ }
+
+ private void startAnimation(final AnimatorSet animatorSet) throws Throwable {
+ this.runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.startAnimatorSet(animatorSet);
+ }
+ });
+ }
+}
diff --git a/tests/tests/animation/src/android/animation/cts/AnimatorTest.java b/tests/tests/animation/src/android/animation/cts/AnimatorTest.java
new file mode 100644
index 0000000..f460c14
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/AnimatorTest.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.animation.cts;
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.test.ActivityInstrumentationTestCase2;
+import android.view.animation.AccelerateInterpolator;
+
+import java.util.List;
+
+public class AnimatorTest extends ActivityInstrumentationTestCase2<AnimationActivity> {
+ private AnimationActivity mActivity;
+ private Animator mAnimator;
+ private long mDuration = 1000;
+ public AnimatorTest() {
+ super(AnimationActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ setActivityInitialTouchMode(false);
+ mActivity = getActivity();
+ mAnimator = mActivity.createAnimatorWithDuration(mDuration);
+ }
+
+ public void testConstructor() {
+ mAnimator = new ValueAnimator();
+ assertNotNull(mAnimator);
+ }
+
+ public void testClone() {
+ Animator animatorClone = mAnimator.clone();
+ assertEquals(mAnimator.getDuration(), animatorClone.getDuration());
+ }
+
+ public void testStartDelay() {
+ long startDelay = 1000;
+ mAnimator.setStartDelay(startDelay);
+ assertEquals(startDelay, mAnimator.getStartDelay());
+ }
+
+ public void testStart() {
+ mAnimator.start();
+ assertTrue(mAnimator.isRunning());
+ assertTrue(mAnimator.isStarted());
+ }
+
+ public void testGetDuration() throws Throwable {
+ final long duration = 2000;
+ Animator animatorLocal = mActivity.createAnimatorWithDuration(duration);
+ startAnimation(animatorLocal);
+ assertEquals(duration, animatorLocal.getDuration());
+ }
+
+ public void testIsRunning() throws Throwable {
+ assertFalse(mAnimator.isRunning());
+ startAnimation(mAnimator);
+ assertTrue(mAnimator.isRunning());
+ }
+
+ public void testIsStarted() throws Throwable {
+ assertFalse(mAnimator.isRunning());
+ assertFalse(mAnimator.isStarted());
+ long startDelay = 10000;
+ mAnimator.setStartDelay(startDelay);
+ startAnimation(mAnimator);
+ assertFalse(mAnimator.isRunning());
+ assertTrue(mAnimator.isStarted());
+ }
+
+ public void testSetInterpolator() throws Throwable {
+ AccelerateInterpolator interpolator = new AccelerateInterpolator();
+ ValueAnimator mValueAnimator = mActivity.createAnimatorWithInterpolator(interpolator);
+ startAnimation(mValueAnimator);
+ assertTrue(interpolator.equals(mValueAnimator.getInterpolator()));
+ }
+
+ public void testCancel() throws Throwable {
+ startAnimation(mAnimator);
+ Thread.sleep(100);
+ mAnimator.cancel();
+ assertFalse(mAnimator.isRunning());
+ }
+
+ public void testEnd() throws Throwable {
+ Object object = mActivity.view.newBall;
+ String property = "y";
+ float startY = mActivity.mStartY;
+ float endY = mActivity.mStartY + mActivity.mDeltaY;
+ Animator animator = ObjectAnimator.ofFloat(object, property, startY, endY);
+ animator.setDuration(mDuration);
+ ((ObjectAnimator)animator).setRepeatCount(ValueAnimator.INFINITE);
+ animator.setInterpolator(new AccelerateInterpolator());
+ ((ObjectAnimator)animator).setRepeatMode(ValueAnimator.REVERSE);
+ startAnimation(animator);
+ Thread.sleep(100);
+ endAnimation(animator);
+ float y = mActivity.view.newBall.getY();
+ assertEquals(y, endY);
+ }
+
+ public void testSetListener() throws Throwable {
+ List<Animator.AnimatorListener> listListeners = mAnimator.getListeners();
+ assertNull(listListeners);
+ MyListener listener = new MyListener();
+ assertFalse(listener.mStart);
+ assertFalse(listener.mEnd);
+ assertEquals(listener.mRepeat, 0);
+ mAnimator.addListener(listener);
+ mAnimator.setDuration(100l);
+ startAnimation(mAnimator);
+ Thread.sleep(200);
+
+ assertTrue(listener.mStart);
+ assertFalse(listener.mEnd);
+ assertTrue(listener.mRepeat >= 0);
+
+ mAnimator.cancel();
+ assertTrue(listener.mCancel);
+
+ mAnimator.end();
+ assertTrue(listener.mEnd);
+ }
+
+ public void testRemoveListener() throws Throwable {
+ List<Animator.AnimatorListener> listListenersOne = mAnimator.getListeners();
+ assertNull(listListenersOne);
+ MyListener listener = new MyListener();
+ mAnimator.addListener(listener);
+
+ List<Animator.AnimatorListener> listListenersTwo = mAnimator.getListeners();
+ assertEquals(listListenersTwo.size(), 1);
+ mAnimator.removeListener(listener);
+
+ List<Animator.AnimatorListener> listListenersThree = mAnimator.getListeners();
+ assertNull(listListenersThree);
+ }
+
+ public void testRemoveAllListenerers() throws Throwable {
+ MyListener listener1 = new MyListener();
+ MyListener listener2 = new MyListener();
+ mAnimator.addListener(listener1);
+ mAnimator.addListener(listener2);
+
+ List<Animator.AnimatorListener> listListenersOne = mAnimator.getListeners();
+ assertEquals(listListenersOne.size(), 2);
+ mAnimator.removeAllListeners();
+
+ List<Animator.AnimatorListener> listListenersTwo = mAnimator.getListeners();
+ assertNull(listListenersTwo);
+ }
+
+ class MyListener implements Animator.AnimatorListener{
+ boolean mStart = false;
+ boolean mEnd = false;
+ boolean mCancel = false;
+ int mRepeat = 0;
+
+ public void onAnimationCancel(Animator animation) {
+ mCancel = true;
+ }
+
+ public void onAnimationEnd(Animator animation) {
+ mEnd = true;
+ }
+
+ public void onAnimationRepeat(Animator animation) {
+ mRepeat++;
+ }
+
+ public void onAnimationStart(Animator animation) {
+ mStart = true;
+ }
+ }
+ private void startAnimation(final Animator animator) throws Throwable {
+ this.runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.startAnimation(animator);
+ }
+ });
+ }
+
+ private void endAnimation(final Animator animator) throws Throwable {
+ Thread animationRunnable = new Thread() {
+ public void run() {
+ animator.end();
+ }
+ };
+ this.runTestOnUiThread(animationRunnable);
+ }
+}
+
diff --git a/tests/tests/animation/src/android/animation/cts/ArgbEvaluatorTest.java b/tests/tests/animation/src/android/animation/cts/ArgbEvaluatorTest.java
index 33c3716..4fee87d 100644
--- a/tests/tests/animation/src/android/animation/cts/ArgbEvaluatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ArgbEvaluatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tests/tests/animation/src/android/animation/cts/FloatEvaluatorTest.java b/tests/tests/animation/src/android/animation/cts/FloatEvaluatorTest.java
index 8cc1ffe..ebc7f58 100644
--- a/tests/tests/animation/src/android/animation/cts/FloatEvaluatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/FloatEvaluatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tests/tests/animation/src/android/animation/cts/IntEvaluatorTest.java b/tests/tests/animation/src/android/animation/cts/IntEvaluatorTest.java
index 11df20c..2b95993 100644
--- a/tests/tests/animation/src/android/animation/cts/IntEvaluatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/IntEvaluatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tests/tests/animation/src/android/animation/cts/KeyframeTest.java b/tests/tests/animation/src/android/animation/cts/KeyframeTest.java
new file mode 100644
index 0000000..7366920
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/KeyframeTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.animation.cts;
+
+import android.animation.Keyframe;
+import android.animation.TimeInterpolator;
+import android.test.InstrumentationTestCase;
+import android.view.animation.AccelerateInterpolator;
+
+public class KeyframeTest extends InstrumentationTestCase {
+ public void testGetFraction() {
+ Keyframe keyFrame = Keyframe.ofInt(0.0f);
+ float fraction = keyFrame.getFraction();
+ assertTrue(fraction == 0.0f);
+ }
+
+ public void testSetFraction() {
+ Keyframe keyFrame = Keyframe.ofInt(0.0f);
+ keyFrame.setFraction(0.5f);
+ float fraction = keyFrame.getFraction();
+ assertTrue(fraction == 0.5f);
+ }
+
+ public void testOfFloat() {
+ Keyframe keyFrame = Keyframe.ofFloat(0.0f);
+ float fraction = keyFrame.getFraction();
+ assertEquals(fraction, 0.0f);
+ }
+
+ public void testOfIntValue() {
+ Keyframe keyFrame = Keyframe.ofInt(0.0f,10);
+ assertTrue(keyFrame.hasValue());
+ assertEquals(keyFrame.getValue(),10);
+ }
+
+ public void testOfFloatValue() {
+ Keyframe keyFrame = Keyframe.ofFloat(0.0f,9.0f);
+ assertTrue(keyFrame.hasValue());
+ assertEquals(keyFrame.getValue(),9.0f);
+ }
+
+ public void testOfObject() {
+ Keyframe keyFrame = Keyframe.ofObject(0.0f);
+ float fraction = keyFrame.getFraction();
+ assertEquals(fraction, 0.0f);
+ }
+
+ public void testOfObjectValue() {
+ String value = "test";
+ Keyframe keyFrame = Keyframe.ofObject(0.0f, value);
+ assertTrue(keyFrame.hasValue());
+ assertEquals(keyFrame.getValue(), value);
+ }
+
+ public void testGetType() {
+ Keyframe keyFrame = Keyframe.ofFloat(0.0f);
+ Class typeClass = keyFrame.getType();
+ String typeName = typeClass.getName();
+ assertEquals(typeName, "float");
+ }
+
+ public void testClone() {
+ Keyframe keyFrame = Keyframe.ofFloat(0.0f);
+ Keyframe clone = keyFrame.clone();
+ assertEquals(keyFrame.getFraction(), clone.getFraction());
+ }
+
+ public void testSetInterpolator() {
+ Keyframe keyFrame = Keyframe.ofFloat(0.0f);
+ TimeInterpolator interpolator = new AccelerateInterpolator();
+ keyFrame.setInterpolator(interpolator);
+ assertEquals(interpolator, keyFrame.getInterpolator());
+ }
+
+ public void testSetValue() {
+ Keyframe keyFrame = Keyframe.ofFloat(0.0f);
+ Float value = new Float(100.0f);
+ keyFrame.setValue(value);
+ Float actualValue = (Float)keyFrame.getValue();
+ assertEquals(value, actualValue);
+ }
+}
+
diff --git a/tests/tests/animation/src/android/animation/cts/LayoutAnimationActivity.java b/tests/tests/animation/src/android/animation/cts/LayoutAnimationActivity.java
new file mode 100644
index 0000000..9b2eaff
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/LayoutAnimationActivity.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.animation.cts;
+
+import com.android.cts.animation.R;
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+public class LayoutAnimationActivity extends Activity {
+ private int mCount = 1;
+ Button mButton;
+ private Button mLastButton;
+ @Override
+ public void onCreate(Bundle bundle){
+ super.onCreate(bundle);
+ setContentView(R.layout.animation_two);
+ mButton = (Button) findViewById(R.id.button1);
+
+ mButton.setOnClickListener(new OnClickListener(){
+ public void onClick(View v) {
+ Button newButton = new Button(LayoutAnimationActivity.this);
+ newButton.setText("Button:" + LayoutAnimationActivity.this.mCount);
+ LinearLayout layout = (LinearLayout) findViewById(R.id.container);
+ layout.addView(newButton);
+ LayoutAnimationActivity.this.mCount++;
+ mLastButton = newButton;
+ }
+ });
+ }
+
+ public Button getLastButton() {
+ return mLastButton;
+ }
+}
diff --git a/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java b/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java
new file mode 100644
index 0000000..f9918a8
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.animation.cts;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.android.cts.animation.R;
+
+import android.animation.Animator;
+import android.animation.LayoutTransition;
+import android.animation.LayoutTransition.TransitionListener;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.TimeInterpolator;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.TouchUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AccelerateInterpolator;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+public class LayoutAnimationTest extends
+ ActivityInstrumentationTestCase2<LayoutAnimationActivity> {
+ private LayoutAnimationActivity mActivity;
+ private MyLayoutTransition mLayoutTransition;
+ private LinearLayout mView;
+ private Button mButton;
+ public LayoutAnimationTest() {
+ super(LayoutAnimationActivity.class);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ setActivityInitialTouchMode(true);
+ mActivity = getActivity();
+ mView = (LinearLayout) mActivity.findViewById(R.id.container);
+ mButton = (Button)mActivity.findViewById(R.id.button1);
+ mLayoutTransition = new MyLayoutTransition();
+ }
+
+ public void testAddTransitionListener() throws Throwable {
+ MyTransitionListener listener = new MyTransitionListener();
+ assertNull(mLayoutTransition.getTransitionListeners());
+ mLayoutTransition.addTransitionListener(listener);
+
+ List<TransitionListener> layoutTransitionList = mLayoutTransition.getTransitionListeners();
+ TransitionListener actualListener = layoutTransitionList.get(0);
+ assertEquals(1, layoutTransitionList.size());
+ assertEquals(listener, actualListener);
+ }
+
+ public void testIsRunning() {
+ setDefaultTransition();
+ assertFalse(mLayoutTransition.isRunning());
+ TouchUtils.clickView(this, mButton);
+ assertTrue(mLayoutTransition.isRunning());
+ }
+
+ public void testIsChangingLayout() {
+ long duration = 2000l;
+ mView.setLayoutTransition(mLayoutTransition);
+ mLayoutTransition.setDuration(duration);
+ mLayoutTransition.setInterpolator(LayoutTransition.CHANGE_APPEARING,
+ new AccelerateInterpolator());
+
+ assertFalse(mLayoutTransition.isChangingLayout());
+ TouchUtils.clickView(this, mButton);
+ assertTrue(mLayoutTransition.isChangingLayout());
+ }
+
+ public void testSetDuration() {
+ long duration = 1000l;
+ mLayoutTransition.setDuration(duration);
+
+ assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.APPEARING));
+ assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.CHANGE_APPEARING));
+ assertEquals(duration,
+ mLayoutTransition.getDuration(LayoutTransition.CHANGE_DISAPPEARING));
+ assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.DISAPPEARING));
+ }
+
+ public void testSetDurationForTransitionType() {
+ long duration = 1000l;
+ mLayoutTransition.setDuration(LayoutTransition.APPEARING, duration);
+ assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.APPEARING));
+ }
+
+ public void testSetInterpolator() {
+ TimeInterpolator interpolator = new AccelerateInterpolator();
+ mLayoutTransition.setInterpolator(LayoutTransition.APPEARING, interpolator);
+ assertEquals(interpolator, mLayoutTransition.getInterpolator(
+ LayoutTransition.APPEARING));
+ }
+
+ public void testSetAnimator() {
+ float startAlpha = 0.0f;
+ float endAlpha = 0.5f;
+ PropertyValuesHolder pvhAlpha = PropertyValuesHolder.ofFloat("alpha", startAlpha,
+ endAlpha);
+ ObjectAnimator appearingAnimator = (ObjectAnimator) ObjectAnimator.ofPropertyValuesHolder(
+ (Object)null, pvhAlpha);
+ appearingAnimator.setInterpolator(new AccelerateInterpolator());
+ mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearingAnimator);
+ assertEquals(appearingAnimator, mLayoutTransition.getAnimator(LayoutTransition.APPEARING));
+ }
+
+ public void testAnimationWithAnimator() throws Throwable {
+ MyTransitionListener listener = new MyTransitionListener();
+ mLayoutTransition.addTransitionListener(listener);
+ mLayoutTransition.setAnimateParentHierarchy(false);
+ long duration = 2000;
+ mView.setLayoutTransition(mLayoutTransition);
+ mLayoutTransition.setDuration(duration);
+ float startAlpha = 0.0f;
+ float endAlpha = 0.5f;
+ PropertyValuesHolder pvhAlpha = PropertyValuesHolder.ofFloat("alpha", startAlpha,
+ endAlpha);
+ ObjectAnimator appearingAnimator = (ObjectAnimator) ObjectAnimator.ofPropertyValuesHolder(
+ (Object)null, pvhAlpha);
+ appearingAnimator.setInterpolator(new AccelerateInterpolator());
+
+ mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearingAnimator);
+
+ List<Float> alphaList = new LinkedList<Float>();
+ TouchUtils.clickView(this, mButton);
+ while(listener.mTransition) {
+ float alpha = mActivity.getLastButton().getAlpha();
+ alphaList.add(alpha);
+ Thread.sleep(200);
+ }
+ Iterator<Float> iterator = alphaList.iterator();
+ float lastValue = 0.0f;
+ while(iterator.hasNext()){
+ float alphaValue = iterator.next();
+ assertTrue(alphaValue >= lastValue);
+ assertTrue(alphaValue >= startAlpha);
+ assertTrue(alphaValue <= endAlpha);
+ lastValue = alphaValue;
+ }
+ }
+
+ public void testStartDelay() {
+ long delay = 100l;
+ int transitionType = LayoutTransition.APPEARING;
+ mLayoutTransition.setStartDelay(transitionType, delay);
+ assertEquals(delay, mLayoutTransition.getStartDelay(transitionType));
+ }
+
+ public void testSetStagger() {
+ long duration = 100;
+ int transitionType = LayoutTransition.CHANGE_APPEARING;
+ mLayoutTransition.setStagger(transitionType, duration);
+ assertEquals(duration, mLayoutTransition.getStagger(transitionType));
+ }
+
+ private void setDefaultTransition() {
+ long duration = 1000;
+ mView.setLayoutTransition(mLayoutTransition);
+ mLayoutTransition.setDuration(duration);
+ mLayoutTransition.setInterpolator(LayoutTransition.APPEARING,
+ new AccelerateInterpolator());
+ }
+
+ class MyTransitionListener implements LayoutTransition.TransitionListener {
+ ViewGroup mContainer;
+ View mView;
+ int mTransitionType;
+ boolean mTransition = false;
+ public void endTransition(LayoutTransition transition,
+ ViewGroup container, View view, int transitionType) {
+ this.mContainer = container;
+ this.mView = view;
+ this.mTransitionType = transitionType;
+ mTransition = false;
+ }
+
+ public void startTransition(LayoutTransition transition,
+ ViewGroup container, View view, int transitionType) {
+ this.mContainer = container;
+ this.mView = view;
+ this.mTransitionType = transitionType;
+ mTransition = true;
+ }
+ }
+
+ class MyLayoutTransition extends LayoutTransition {
+ boolean mAddChild = false;
+ boolean mHideChild = false;
+ boolean mRemoveChild = false;
+ boolean mShowChild = false;
+ boolean mSetAnimator = false;
+ boolean mRemoveListener = false;
+ boolean isChangingLayout = false;
+
+ @Override
+ public void addChild(ViewGroup parent, View child) {
+ super.addChild(parent, child);
+ mAddChild = true;
+ }
+
+ @Override
+ public void hideChild(ViewGroup parent, View child) {
+ super.hideChild(parent, child);
+ mHideChild = true;
+ }
+
+ @Override
+ public boolean isChangingLayout() {
+ return super.isChangingLayout();
+ }
+
+ @Override
+ public boolean isRunning() {
+ isChangingLayout = true;
+ return super.isRunning();
+ }
+
+ @Override
+ public void removeChild(ViewGroup parent, View child) {
+ super.removeChild(parent, child);
+ mRemoveChild = true;
+ }
+
+ @Override
+ public void removeTransitionListener(TransitionListener listener) {
+ super.removeTransitionListener(listener);
+ mRemoveListener = true;
+ }
+
+ @Override
+ public void setAnimator(int transitionType, Animator animator) {
+ super.setAnimator(transitionType, animator);
+ mSetAnimator = true;
+ }
+
+ @Override
+ public void showChild(ViewGroup parent, View child) {
+ super.showChild(parent, child);
+ mShowChild = true;
+ }
+ }
+}
+
diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index be5c1d4..c1cbfcc 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java b/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
new file mode 100644
index 0000000..26db933
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.animation.cts;
+
+import android.animation.Animator;
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.ValueAnimator;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.Property;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+
+public class PropertyValuesHolderTest extends
+ ActivityInstrumentationTestCase2<AnimationActivity> {
+ private AnimationActivity mActivity;
+ private Animator mAnimator;
+ private long mDuration = 1000;
+ private float mStartY;
+ private float mEndY;
+ private Object mObject;
+ private String mProperty;
+
+ public PropertyValuesHolderTest() {
+ super(AnimationActivity.class);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ setActivityInitialTouchMode(false);
+ mActivity = getActivity();
+ mAnimator = mActivity.createAnimatorWithDuration(mDuration);
+ mProperty = "y";
+ mStartY = mActivity.mStartY;
+ mEndY = mActivity.mStartY + mActivity.mDeltaY;
+ mObject = mActivity.view.newBall;
+ }
+
+ public void testGetPropertyName() {
+ float[] values = {mStartY, mEndY};
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
+ assertEquals(mProperty, pVHolder.getPropertyName());
+ }
+
+ public void testSetPropertyName() {
+ float[] values = {mStartY, mEndY};
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat("", values);
+ pVHolder.setPropertyName(mProperty);
+ assertEquals(mProperty, pVHolder.getPropertyName());
+ }
+
+ public void testClone() {
+ float[] values = {mStartY, mEndY};
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
+ PropertyValuesHolder cloneHolder = pVHolder.clone();
+ assertEquals(pVHolder.getPropertyName(), cloneHolder.getPropertyName());
+ }
+
+ public void testSetValues() throws Throwable {
+ float[] dummyValues = {100, 150};
+ float[] values = {mStartY, mEndY};
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, dummyValues);
+ pVHolder.setFloatValues(values);
+
+ ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject,pVHolder);
+ assertTrue(objAnimator != null);
+ setAnimatorProperties(objAnimator);
+
+ startAnimation(objAnimator);
+ assertTrue(objAnimator != null);
+ float[] yArray = getYPosition();
+ assertResults(yArray, mStartY, mEndY);
+ }
+
+ public void testOffloat() throws Throwable {
+ float[] values = {mStartY, mEndY};
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
+ assertNotNull(pVHolder);
+ ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject,pVHolder);
+ assertTrue(objAnimator != null);
+
+ setAnimatorProperties(objAnimator);
+ startAnimation(objAnimator);
+ assertTrue(objAnimator != null);
+ float[] yArray = getYPosition();
+ assertResults(yArray, mStartY, mEndY);
+ }
+
+ public void testOfFloat_Property() throws Throwable {
+ float[] values = {mStartY, mEndY};
+ ShapeHolderYProperty property=new ShapeHolderYProperty(ShapeHolder.class.getClass(),"y");
+ property.setObject(mObject);
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(property, values);
+ assertNotNull(pVHolder);
+ ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject,pVHolder);
+ assertTrue(objAnimator != null);
+
+ setAnimatorProperties(objAnimator);
+ startAnimation(objAnimator);
+ assertTrue(objAnimator != null);
+ float[] yArray = getYPosition();
+ assertResults(yArray, mStartY, mEndY);
+ }
+
+ public void testOfInt() throws Throwable {
+ int start = 0;
+ int end = 10;
+ int[] values = {start, end};
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofInt(mProperty, values);
+ assertNotNull(pVHolder);
+ final ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject,pVHolder);
+ assertTrue(objAnimator != null);
+ setAnimatorProperties(objAnimator);
+ this.runTestOnUiThread(new Runnable(){
+ public void run() {
+ objAnimator.start();
+ }
+ });
+ Thread.sleep(1000);
+ assertTrue(objAnimator.isRunning());
+ Integer animatedValue = (Integer) objAnimator.getAnimatedValue();
+ assertTrue(animatedValue >= start);
+ assertTrue(animatedValue <= end);
+ }
+
+ public void testOfInt_Property() throws Throwable{
+ Object object = mActivity.view;
+ String property = "backgroundColor";
+ int startColor = mActivity.view.RED;
+ int endColor = mActivity.view.BLUE;
+ int values[] = {startColor, endColor};
+
+ ViewColorProperty colorProperty=new ViewColorProperty(Integer.class.getClass(),property);
+ colorProperty.setObject(object);
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofInt(colorProperty, values);
+ assertNotNull(pVHolder);
+
+ ObjectAnimator colorAnimator = ObjectAnimator.ofPropertyValuesHolder(object,pVHolder);
+ colorAnimator.setDuration(1000);
+ colorAnimator.setEvaluator(new ArgbEvaluator());
+ colorAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
+
+ ObjectAnimator objectAnimator = (ObjectAnimator) mActivity.createAnimatorWithDuration(
+ mDuration);
+ startAnimation(objectAnimator, colorAnimator);
+ Thread.sleep(1000);
+ Integer i = (Integer) colorAnimator.getAnimatedValue();
+ //We are going from less negative value to a more negative value
+ assertTrue(i.intValue() <= startColor);
+ assertTrue(endColor <= i.intValue());
+ }
+
+ public void testSetProperty() throws Throwable {
+ float[] values = {mStartY, mEndY};
+ ShapeHolderYProperty property=new ShapeHolderYProperty(ShapeHolder.class.getClass(),"y");
+ property.setObject(mObject);
+ PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat("", values);
+ pVHolder.setProperty(property);
+ ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject,pVHolder);
+ setAnimatorProperties(objAnimator);
+ startAnimation(objAnimator);
+ assertTrue(objAnimator != null);
+ float[] yArray = getYPosition();
+ assertResults(yArray, mStartY, mEndY);
+ }
+
+ class ShapeHolderYProperty extends Property {
+ private ShapeHolder shapeHolder ;
+ private Class type = Float.class.getClass();
+ private String name = "y";
+ @SuppressWarnings("unchecked")
+ public ShapeHolderYProperty(Class type, String name) throws Exception {
+ super(Float.class, name );
+ if(!( type.equals(this.type) || ( name.equals(this.name))) ){
+ throw new Exception("Type or name provided does not match with " +
+ this.type.getName() + " or " + this.name);
+ }
+ }
+
+ public void setObject(Object object){
+ shapeHolder = (ShapeHolder) object;
+ }
+
+ @Override
+ public Object get(Object object) {
+ return shapeHolder;
+ }
+
+ @Override
+ public String getName() {
+ return "y";
+ }
+
+ @Override
+ public Class getType() {
+ return super.getType();
+ }
+
+ @Override
+ public boolean isReadOnly() {
+ return false;
+ }
+
+ @Override
+ public void set(Object object, Object value) {
+ shapeHolder.setY((Float)value);
+ }
+
+ }
+
+ class ViewColorProperty extends Property {
+ private View view ;
+ private Class type = Integer.class.getClass();
+ private String name = "backgroundColor";
+ @SuppressWarnings("unchecked")
+ public ViewColorProperty(Class type, String name) throws Exception {
+ super(Integer.class, name );
+ if(!( type.equals(this.type) || ( name.equals(this.name))) ){
+ throw new Exception("Type or name provided does not match with " +
+ this.type.getName() + " or " + this.name);
+ }
+ }
+
+ public void setObject(Object object){
+ view = (View) object;
+ }
+
+ @Override
+ public Object get(Object object) {
+ return view;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public Class getType() {
+ return super.getType();
+ }
+
+ @Override
+ public boolean isReadOnly() {
+ return false;
+ }
+
+ @Override
+ public void set(Object object, Object value) {
+ view.setBackgroundColor((Integer)value);
+ }
+ }
+
+ private void setAnimatorProperties(ObjectAnimator objAnimator) {
+ objAnimator.setDuration(mDuration);
+ objAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ objAnimator.setInterpolator(new AccelerateInterpolator());
+ objAnimator.setRepeatMode(ValueAnimator.REVERSE);
+ }
+
+ public float[] getYPosition() throws Throwable{
+ float[] yArray = new float[3];
+ for(int i = 0; i < 3; i++) {
+ float y = mActivity.view.newBall.getY();
+ yArray[i] = y;
+ Thread.sleep(300);
+ }
+ return yArray;
+ }
+
+ public void assertResults(float[] yArray,float startY, float endY) {
+ for(int i = 0; i < 3; i++){
+ float y = yArray[i];
+ assertTrue(y >= startY);
+ assertTrue(y <= endY);
+ if(i < 2) {
+ float yNext = yArray[i+1];
+ assertTrue(y != yNext);
+ }
+ }
+ }
+
+ private void startAnimation(final Animator animator) throws Throwable {
+ this.runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.startAnimation(animator);
+ }
+ });
+ }
+
+ private void startAnimation(final ObjectAnimator mObjectAnimator,
+ final ObjectAnimator colorAnimator) throws Throwable {
+ Thread mAnimationRunnable = new Thread() {
+ public void run() {
+ mActivity.startAnimation(mObjectAnimator, colorAnimator);
+ }
+ };
+ this.runTestOnUiThread(mAnimationRunnable);
+ }
+}
+
diff --git a/tests/tests/animation/src/android/animation/cts/ShapeHolder.java b/tests/tests/animation/src/android/animation/cts/ShapeHolder.java
index f8d5fa6..4723c67 100644
--- a/tests/tests/animation/src/android/animation/cts/ShapeHolder.java
+++ b/tests/tests/animation/src/android/animation/cts/ShapeHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index a7626bc..1bfe737 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
*/
package android.animation.cts;
-import android.animation.ArgbEvaluator;
-import android.animation.FloatEvaluator;
-import android.animation.IntEvaluator;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.test.ActivityInstrumentationTestCase2;
@@ -51,7 +48,7 @@
public void testIsRunning() throws Throwable {
assertFalse(mValueAnimator.isRunning());
startAnimation(mValueAnimator);
- ValueAnimator valueAnimatorReturned = mActivity.view.bounceAnimator;
+ ValueAnimator valueAnimatorReturned = mActivity.view.bounceYAnimator;
assertTrue(valueAnimatorReturned.isRunning());
}
@@ -66,7 +63,8 @@
}
public void testRepeatMode() throws Throwable {
- ValueAnimator mValueAnimator = mActivity.createAnimatorWithRepeatMode(ValueAnimator.RESTART);
+ ValueAnimator mValueAnimator = mActivity.createAnimatorWithRepeatMode(
+ ValueAnimator.RESTART);
startAnimation(mValueAnimator);
assertEquals(ValueAnimator.RESTART, mValueAnimator.getRepeatMode());
}
diff --git a/tests/tests/app/Android.mk b/tests/tests/app/Android.mk
index a9b75df..b3aae14 100644
--- a/tests/tests/app/Android.mk
+++ b/tests/tests/app/Android.mk
@@ -29,4 +29,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index 37ded56..67470a0 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -32,6 +32,7 @@
import android.content.DialogInterface.OnKeyListener;
import android.content.res.Resources;
import android.content.res.TypedArray;
+import android.cts.util.PollingCheck;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.drawable.Drawable;
@@ -42,7 +43,6 @@
import android.os.Message;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -684,7 +684,7 @@
mInstrumentation.waitForIdleSync();
// Wait until TestDialog#OnWindowFocusChanged() is called
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return d.isOnWindowFocusChangedCalled;
}
diff --git a/tests/tests/app/src/android/app/cts/DownloadManagerTest.java b/tests/tests/app/src/android/app/cts/DownloadManagerTest.java
index a225749..1da6af9 100644
--- a/tests/tests/app/src/android/app/cts/DownloadManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/DownloadManagerTest.java
@@ -22,12 +22,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.cts.CtsTestServer;
import java.io.File;
@@ -314,7 +314,7 @@
}
private void assertDownloadQueryableByStatus(final int status) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
Cursor cursor= null;
diff --git a/tests/tests/app/src/android/app/cts/IntentServiceTest.java b/tests/tests/app/src/android/app/cts/IntentServiceTest.java
index d844aa9..0d2f11b 100644
--- a/tests/tests/app/src/android/app/cts/IntentServiceTest.java
+++ b/tests/tests/app/src/android/app/cts/IntentServiceTest.java
@@ -21,8 +21,8 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.cts.util.PollingCheck;
import android.os.IBinder;
-import android.view.animation.cts.DelayedCheck;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@@ -106,7 +106,7 @@
public void testIntentServiceLifeCycle() throws Throwable {
// start service
mContext.startService(mIntent);
- new DelayedCheck(TIMEOUT_MSEC) {
+ new PollingCheck(TIMEOUT_MSEC) {
protected boolean check() {
return IntentServiceStub.onHandleIntentCalled > 0;
}
@@ -117,7 +117,7 @@
// bind service
ServiceConnection conn = new TestConnection();
mContext.bindService(mIntent, conn, Context.BIND_AUTO_CREATE);
- new DelayedCheck(TIMEOUT_MSEC) {
+ new PollingCheck(TIMEOUT_MSEC) {
protected boolean check() {
return mConnected;
}
diff --git a/tests/tests/bluetooth/Android.mk b/tests/tests/bluetooth/Android.mk
index d1bb4ec..94c6c19 100644
--- a/tests/tests/bluetooth/Android.mk
+++ b/tests/tests/bluetooth/Android.mk
@@ -32,4 +32,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
index 8afebc3..e64da89 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
@@ -177,18 +177,30 @@
// test bad addresses
try {
- adapter.getRemoteDevice(null);
+ adapter.getRemoteDevice((String)null);
fail("IllegalArgumentException not thrown");
} catch (IllegalArgumentException e) {}
try {
adapter.getRemoteDevice("00:00:00:00:00:00:00:00");
fail("IllegalArgumentException not thrown");
} catch (IllegalArgumentException e) {}
+ try {
+ adapter.getRemoteDevice((byte[])null);
+ fail("IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+ try {
+ adapter.getRemoteDevice(new byte[] {0x00, 0x00, 0x00, 0x00, 0x00});
+ fail("IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
// test success
BluetoothDevice device = adapter.getRemoteDevice("00:11:22:AA:BB:CC");
assertNotNull(device);
assertEquals("00:11:22:AA:BB:CC", device.getAddress());
+ device = adapter.getRemoteDevice(
+ new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06});
+ assertNotNull(device);
+ assertEquals("01:02:03:04:05:06", device.getAddress());
}
public void test_listenUsingRfcommWithServiceRecord() throws IOException {
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk
index a2f0e0f..ae2aee8 100644
--- a/tests/tests/content/Android.mk
+++ b/tests/tests/content/Android.mk
@@ -29,5 +29,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
index ae02e0a..ca6bba7 100644
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
+++ b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
@@ -18,9 +18,9 @@
import android.content.ClipData;
import android.content.ClipboardManager.OnPrimaryClipChangedListener;
+import android.cts.util.PollingCheck;
import android.net.Uri;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
public class ClipboardManagerListenerTest
@@ -57,7 +57,7 @@
}
private void assertClipChangedCount(final int expectedCount) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return expectedCount == mListener.getCount();
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index b866375..9378e63 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -29,13 +29,13 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
+import android.cts.util.PollingCheck;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -637,7 +637,7 @@
values.put(COLUMN_KEY_NAME, "key10");
values.put(COLUMN_VALUE_NAME, 10);
mContentResolver.update(TABLE1_URI, values, null, null);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mco.hadOnChanged();
@@ -689,7 +689,7 @@
assertFalse(mco.hadOnChanged());
mContentResolver.notifyChange(TABLE1_URI, mco);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mco.hadOnChanged();
@@ -713,7 +713,7 @@
assertFalse(mco.hadOnChanged());
mContentResolver.notifyChange(TABLE1_URI, mco, false);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mco.hadOnChanged();
diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index 6ad14e0..3e1e3e4 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -35,6 +35,7 @@
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.database.sqlite.SQLiteCursorDriver;
import android.database.sqlite.SQLiteDatabase;
@@ -48,7 +49,6 @@
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.io.File;
import java.io.IOException;
@@ -176,7 +176,7 @@
final Intent broadcastIntent = new Intent(ResultReceiver.MOCK_ACTION);
mContextWrapper.sendOrderedBroadcast(broadcastIntent, null);
- new DelayedCheck(BROADCAST_TIMEOUT) {
+ new PollingCheck(BROADCAST_TIMEOUT) {
@Override
protected boolean check() {
return highPriorityReceiver.hasReceivedBroadCast()
@@ -188,7 +188,7 @@
highPriorityReceiver.notify();
}
- new DelayedCheck(BROADCAST_TIMEOUT) {
+ new PollingCheck(BROADCAST_TIMEOUT) {
@Override
protected boolean check() {
return highPriorityReceiver.hasReceivedBroadCast()
@@ -957,7 +957,7 @@
mContextWrapper.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION));
- new DelayedCheck(BROADCAST_TIMEOUT){
+ new PollingCheck(BROADCAST_TIMEOUT){
@Override
protected boolean check() {
return receiver.hasReceivedBroadCast();
@@ -977,7 +977,7 @@
mContextWrapper.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION), null);
- new DelayedCheck(BROADCAST_TIMEOUT){
+ new PollingCheck(BROADCAST_TIMEOUT){
@Override
protected boolean check() {
return receiver.hasReceivedBroadCast();
diff --git a/tests/tests/database/Android.mk b/tests/tests/database/Android.mk
index b565854..85cbe1b 100644
--- a/tests/tests/database/Android.mk
+++ b/tests/tests/database/Android.mk
@@ -31,5 +31,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk
index ffbe8a3..2f256c4 100644
--- a/tests/tests/dpi/Android.mk
+++ b/tests/tests/dpi/Android.mk
@@ -30,7 +30,7 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
# ============================================================
diff --git a/tests/tests/dpi2/Android.mk b/tests/tests/dpi2/Android.mk
index 9dadcf9..cc11256 100644
--- a/tests/tests/dpi2/Android.mk
+++ b/tests/tests/dpi2/Android.mk
@@ -33,4 +33,4 @@
# doesn't currently support setting LOCAL_SDK_VERSION to anything but
# current.
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/drm/Android.mk b/tests/tests/drm/Android.mk
index 61e1f10..6e6ba56 100644
--- a/tests/tests/drm/Android.mk
+++ b/tests/tests/drm/Android.mk
@@ -32,4 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/effect/Android.mk b/tests/tests/effect/Android.mk
new file mode 100644
index 0000000..075dc82
--- /dev/null
+++ b/tests/tests/effect/Android.mk
@@ -0,0 +1,34 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsEffectTestCases
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# All tests should include android.test.runner.
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/effect/AndroidManifest.xml b/tests/tests/effect/AndroidManifest.xml
new file mode 100644
index 0000000..e410800
--- /dev/null
+++ b/tests/tests/effect/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.effect">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <!-- This is a self-instrumenting test package. -->
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.cts.effect"
+ android:label="CTS tests of android.media.effect component"/>
+
+</manifest>
+
diff --git a/tests/tests/effect/src/android/effect/cts/EffectTest.java b/tests/tests/effect/src/android/effect/cts/EffectTest.java
new file mode 100644
index 0000000..007e4f3
--- /dev/null
+++ b/tests/tests/effect/src/android/effect/cts/EffectTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.effect.cts;
+
+import android.graphics.Bitmap;
+import android.media.effect.Effect;
+import android.media.effect.EffectContext;
+import android.media.effect.EffectFactory;
+
+import junit.framework.TestCase;
+
+/**
+ * Test case to assert that the EffectFactory is correctly instantiating the effects that should
+ * be available on all devices, and that they execute as expected.
+ */
+public class EffectTest extends TestCase {
+
+ /** The GL environment that our tests will run in */
+ private GLEnv mEnv;
+
+ /** This is the effect context we will run the tests in */
+ private EffectContext mEffectContext;
+
+ /** This array contains the list of effects we expect to be available and fuctioning */
+ private static String[] mExpectedEffects;
+
+ @Override
+ protected void setUp() throws Exception {
+ mEnv = new GLEnv();
+ mEnv.makeCurrent();
+ mEffectContext = EffectContext.createWithCurrentGlContext();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (mEffectContext != null) {
+ mEffectContext.release();
+ }
+ if (mEnv != null) {
+ mEnv.tearDown();
+ }
+ }
+
+ /** Assert an effect context can be created and attached to GL context. */
+ public void test1_createContext() {
+ assertNotNull("EffectContext attachment", mEffectContext);
+ }
+
+ /** Test that a factory can be retrieved from an EffectContext */
+ public void test2_getFactory() {
+ EffectFactory factory = getEffectContext().getFactory();
+ assertNotNull("EffectFactory retrieval", factory);
+ }
+
+ /** Assert the built-in effects are available */
+ public void test3_availableEffects() {
+ EffectFactory factory = getEffectContext().getFactory();
+ for (String effectName : getExpectedEffectList()) {
+ assertTrue(
+ "Effect '" + effectName + "' supported",
+ factory.isEffectSupported(effectName));
+ }
+ }
+
+ /** Assert that bogus effects are unavailable */
+ public void test4_effectCreate() {
+ EffectFactory factory = getEffectContext().getFactory();
+ assertFalse("Empty effect name unsupported", factory.isEffectSupported(""));
+ assertFalse("Bogus effect name unsupported", factory.isEffectSupported("!BOGUS!"));
+ //assertFalse("Non-effect name unsupported", factory.isEffectSupported("java.lang.String"));
+ }
+
+ /** Assert that we can instantiate an effect */
+ public void test5_effectCreate() {
+ EffectFactory factory = getEffectContext().getFactory();
+ for (String effectName : getExpectedEffectList()) {
+ Effect effect = factory.createEffect(effectName);
+ assertNotNull("Effect '" + effectName + "' instantiation", effect);
+ effect.release();
+ }
+ }
+
+ /** Assert that we can apply an effect */
+ public void test6_effectApply() {
+ EffectFactory factory = getEffectContext().getFactory();
+ Effect effect = factory.createEffect(EffectFactory.EFFECT_SEPIA);
+ Bitmap bitmap = createTestBitmap();
+ int inputTexture = mEnv.bitmapToTexture(bitmap);
+ int outputTexture = mEnv.generateTexture();
+ try {
+ effect.apply(inputTexture, bitmap.getWidth(), bitmap.getHeight(), outputTexture);
+ } catch(RuntimeException e) {
+ fail("Applying EFFECT_SEPIA failed: '" + e.getMessage() + "'");
+ }
+ mEnv.releaseTexture(inputTexture);
+ mEnv.releaseTexture(outputTexture);
+ }
+
+ private EffectContext getEffectContext() {
+ assertNotNull("EffectContext attachment", mEffectContext);
+ return mEffectContext;
+ }
+
+ private Bitmap createTestBitmap() {
+ Bitmap testBitmap = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888);
+ testBitmap.setPixel(0, 0, 0xFF000000);
+ testBitmap.setPixel(0, 1, 0xFF0000FF);
+ testBitmap.setPixel(1, 0, 0xFF00FF00);
+ testBitmap.setPixel(1, 1, 0xFFFF0000);
+ return testBitmap;
+ }
+
+ private String[] getExpectedEffectList() {
+ if (mExpectedEffects == null) {
+ mExpectedEffects = new String[] {
+ EffectFactory.EFFECT_BRIGHTNESS,
+ EffectFactory.EFFECT_CONTRAST,
+ EffectFactory.EFFECT_FISHEYE,
+ EffectFactory.EFFECT_BACKDROPPER,
+ EffectFactory.EFFECT_AUTOFIX,
+ EffectFactory.EFFECT_BLACKWHITE,
+ EffectFactory.EFFECT_CROP,
+ EffectFactory.EFFECT_CROSSPROCESS,
+ EffectFactory.EFFECT_DOCUMENTARY,
+ EffectFactory.EFFECT_BITMAPOVERLAY,
+ EffectFactory.EFFECT_DUOTONE,
+ EffectFactory.EFFECT_FILLLIGHT,
+ EffectFactory.EFFECT_FLIP,
+ EffectFactory.EFFECT_GRAIN,
+ EffectFactory.EFFECT_GRAYSCALE,
+ EffectFactory.EFFECT_LOMOISH,
+ EffectFactory.EFFECT_NEGATIVE,
+ EffectFactory.EFFECT_POSTERIZE,
+ EffectFactory.EFFECT_REDEYE,
+ EffectFactory.EFFECT_ROTATE,
+ EffectFactory.EFFECT_SATURATE,
+ EffectFactory.EFFECT_SEPIA,
+ EffectFactory.EFFECT_SHARPEN,
+ EffectFactory.EFFECT_STRAIGHTEN,
+ EffectFactory.EFFECT_TEMPERATURE,
+ EffectFactory.EFFECT_TINT,
+ EffectFactory.EFFECT_VIGNETTE
+ };
+ }
+ return mExpectedEffects;
+ }
+}
diff --git a/tests/tests/effect/src/android/effect/cts/GLEnv.java b/tests/tests/effect/src/android/effect/cts/GLEnv.java
new file mode 100644
index 0000000..f9f55e7
--- /dev/null
+++ b/tests/tests/effect/src/android/effect/cts/GLEnv.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.effect.cts;
+
+import android.graphics.Bitmap;
+import android.opengl.GLUtils;
+import android.opengl.GLES20;
+
+import javax.microedition.khronos.egl.*;
+import javax.microedition.khronos.opengles.*;
+
+public class GLEnv {
+
+ private EGLContext mEGLContext;
+ private EGLSurface mEGLSurface;
+ private EGLDisplay mEGLDisplay;
+ private EGLConfig mEGLConfig;
+
+ private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+
+ public GLEnv() {
+ EGL10 egl = (EGL10)EGLContext.getEGL();
+
+ mEGLDisplay = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+ checkForEGLErrors("eglGetDisplay");
+
+ int[] version = new int[2];
+ egl.eglInitialize(mEGLDisplay, version);
+ int[] configSpec = {
+ EGL10.EGL_SURFACE_TYPE, EGL10.EGL_PBUFFER_BIT,
+ EGL10.EGL_RED_SIZE, 8,
+ EGL10.EGL_GREEN_SIZE, 8,
+ EGL10.EGL_BLUE_SIZE, 8,
+ EGL10.EGL_NONE
+ };
+ EGLConfig[] configs = new EGLConfig[1];
+ int[] num_config = new int[1];
+ egl.eglChooseConfig(mEGLDisplay, configSpec, configs, 1, num_config);
+ checkForEGLErrors("eglChooseConfig");
+ if (num_config[0] < 1) {
+ throw new RuntimeException("Could not find a suitable config for EGL context!");
+ }
+ mEGLConfig = configs[0];
+
+ int[] attribs = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
+ mEGLContext = egl.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, attribs);
+ checkForEGLErrors("eglCreateContext");
+
+ int[] surfaceSize = { EGL10.EGL_WIDTH, 1, EGL10.EGL_HEIGHT, 1, EGL10.EGL_NONE };
+ mEGLSurface = egl.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig, surfaceSize);
+ checkForEGLErrors("eglCreatePbufferSurface");
+ }
+
+ public void makeCurrent() {
+ EGL10 egl = (EGL10)EGLContext.getEGL();
+ egl.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+ checkForEGLErrors("eglMakeCurrent");
+ }
+
+ public int generateTexture() {
+ int textures[] = new int[1];
+ GLES20.glGenTextures(1, textures, 0);
+ return textures[0];
+ }
+
+ public int bitmapToTexture(Bitmap bitmap) {
+ int texId = generateTexture();
+ GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texId);
+ GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
+ return texId;
+ }
+
+ public void releaseTexture(int texId) {
+ int[] textures = new int[1];
+ textures[0] = texId;
+ GLES20.glDeleteTextures(1, textures, 0);
+ }
+
+ public void tearDown() {
+ EGL10 egl = (EGL10)EGLContext.getEGL();
+ egl.eglDestroySurface(mEGLDisplay, mEGLSurface);
+ egl.eglDestroyContext(mEGLDisplay, mEGLContext);
+ }
+
+ public void checkForEGLErrors(String operation) {
+ EGL10 egl = (EGL10)EGLContext.getEGL();
+ int error = egl.eglGetError();
+ if (error != EGL10.EGL_SUCCESS) {
+ throw new RuntimeException("Operation '" + operation + "' caused EGL error: " + error);
+ }
+ }
+
+}
diff --git a/tests/tests/example/Android.mk b/tests/tests/example/Android.mk
index d32f59b..7e2d841 100644
--- a/tests/tests/example/Android.mk
+++ b/tests/tests/example/Android.mk
@@ -32,4 +32,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/gesture/Android.mk b/tests/tests/gesture/Android.mk
index 22aeaec..f4fa8b3 100755
--- a/tests/tests/gesture/Android.mk
+++ b/tests/tests/gesture/Android.mk
@@ -29,5 +29,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index d0ebd37..9575dd3 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
index 3edaad8..17ab976 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
@@ -30,12 +30,12 @@
import android.app.Activity;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.cts.util.PollingCheck;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.DrawableContainer.DrawableContainerState;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Xml;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ImageView;
import android.widget.cts.ImageViewStubActivity;
@@ -107,7 +107,7 @@
assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX),
mAnimationDrawable.getCurrent());
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -159,7 +159,7 @@
assertTrue(mAnimationDrawable.isRunning());
assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX),
mAnimationDrawable.getCurrent());
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -167,7 +167,7 @@
mAnimationDrawable.start();
}
});
- delayedCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
+ pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -210,7 +210,7 @@
});
assertTrue(mAnimationDrawable.isRunning());
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -342,10 +342,10 @@
mAnimationDrawable.start();
}
});
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
- delayedCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
// begin to repeat
- delayedCheckDrawable(FIRST_FRAME_INDEX, THIRD_FRAME_DURATION);
+ pollingCheckDrawable(FIRST_FRAME_INDEX, THIRD_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -355,8 +355,8 @@
mAnimationDrawable.start();
}
});
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
- delayedCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
// do not repeat
assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
}
@@ -471,12 +471,12 @@
}
/**
- * Delayed check specific frame should be current one in timeout.
+ * Polling check specific frame should be current one in timeout.
* @param index - expected index of frame.
* @param timeout - timeout.
*/
- private void delayedCheckDrawable(final int index, long timeout) {
- new DelayedCheck(timeout + TOLERANCE) {
+ private void pollingCheckDrawable(final int index, long timeout) {
+ new PollingCheck(timeout + TOLERANCE) {
Drawable expected = mAnimationDrawable.getFrame(index);
@Override
protected boolean check() {
diff --git a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureTest.java b/tests/tests/graphics/src/android/opengl/cts/CompressedTextureTest.java
new file mode 100644
index 0000000..3676d66
--- /dev/null
+++ b/tests/tests/graphics/src/android/opengl/cts/CompressedTextureTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import android.os.Bundle;
+import android.test.ActivityInstrumentationTestCase2;
+
+/**
+ */
+public class CompressedTextureTest extends ActivityInstrumentationTestCase2<CompressedTextureStubActivity> {
+
+ public CompressedTextureTest() {
+ super("com.android.cts.stub", CompressedTextureStubActivity.class);
+ }
+
+ private void launchTest(String format) throws Exception {
+ Bundle extras = new Bundle();
+ extras.putString("TextureFormat", format);
+ CompressedTextureStubActivity activity = launchActivity("com.android.cts.stub",
+ CompressedTextureStubActivity.class, extras);
+ activity.finish();
+ }
+
+ public void testTextureUncompressed() throws Exception {
+ launchTest(CompressedTextureLoader.TEXTURE_UNCOMPRESSED);
+ }
+
+ public void testTextureETC1() throws Exception {
+ launchTest(CompressedTextureLoader.TEXTURE_ETC1);
+ }
+
+ public void testTexturePVRTC() throws Exception {
+ launchTest(CompressedTextureLoader.TEXTURE_PVRTC);
+ }
+
+ public void testTextureS3TC() throws Exception {
+ launchTest(CompressedTextureLoader.TEXTURE_S3TC);
+ }
+
+ /*public void testTextureATC() throws Exception {
+ launchTest(CompressedTextureLoader.TEXTURE_ATC);
+ }*/
+}
diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk
index dd3b72f..dd769fa 100644
--- a/tests/tests/hardware/Android.mk
+++ b/tests/tests/hardware/Android.mk
@@ -29,5 +29,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 3b29f6a..ab1bbba 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -50,8 +50,10 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -869,12 +871,21 @@
Camera.Parameters parameters = mCamera.getParameters();
if (!recording) mCamera.startPreview();
double focalLength = parameters.getFocalLength();
+ Date date = new Date(System.currentTimeMillis());
+ String localDatetime = new SimpleDateFormat("yyyy:MM:dd HH:").format(date);
+
mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
waitForSnapshotDone();
+
+ // Test various exif tags.
ExifInterface exif = new ExifInterface(JPEG_PATH);
assertNotNull(exif.getAttribute(ExifInterface.TAG_MAKE));
assertNotNull(exif.getAttribute(ExifInterface.TAG_MODEL));
- assertNotNull(exif.getAttribute(ExifInterface.TAG_DATETIME));
+ String datetime = exif.getAttribute(ExifInterface.TAG_DATETIME);
+ assertNotNull(datetime);
+ // Datetime should be local time.
+ assertTrue(datetime.startsWith(localDatetime));
+ assertTrue(datetime.length() == 19); // EXIF spec is "YYYY:MM:DD HH:MM:SS".
assertTrue(exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, 0) != 0);
assertTrue(exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, 0) != 0);
checkGpsDataNull(exif);
diff --git a/tests/tests/holo/Android.mk b/tests/tests/holo/Android.mk
index 22afc85..513fb20 100644
--- a/tests/tests/holo/Android.mk
+++ b/tests/tests/holo/Android.mk
@@ -32,4 +32,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
index 539f4f8..949a114 100644
--- a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
+++ b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
@@ -100,8 +100,8 @@
addLayout(R.string.button, "button",
R.layout.button, null, NO_TIMEOUT_MS);
-// addLayout(R.string.button_pressed, "button_pressed",
-// R.layout.button, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+ addLayout(R.string.button_pressed, "button_pressed",
+ R.layout.button, new ViewPressedModifier(), LONG_TIMEOUT_MS);
addLayout(R.string.calendarview, "calendar_view",
R.layout.calendarview, new CalendarViewModifier(), SHORT_TIMEOUT_MS);
@@ -161,14 +161,14 @@
addLayout(R.string.ratingbar_5, "ratingbar_5",
R.layout.ratingbar_5, null, NO_TIMEOUT_MS);
-// addLayout(R.string.ratingbar_0_pressed, "ratingbar_0_pressed",
-// R.layout.ratingbar_0, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+ addLayout(R.string.ratingbar_0_pressed, "ratingbar_0_pressed",
+ R.layout.ratingbar_0, new ViewPressedModifier(), LONG_TIMEOUT_MS);
-// addLayout(R.string.ratingbar_2point5_pressed, "ratingbar_2point5_pressed",
-// R.layout.ratingbar_2point5, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+ addLayout(R.string.ratingbar_2point5_pressed, "ratingbar_2point5_pressed",
+ R.layout.ratingbar_2point5, new ViewPressedModifier(), LONG_TIMEOUT_MS);
-// addLayout(R.string.ratingbar_5_pressed, "ratingbar_5_pressed",
-// R.layout.ratingbar_5, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+ addLayout(R.string.ratingbar_5_pressed, "ratingbar_5_pressed",
+ R.layout.ratingbar_5, new ViewPressedModifier(), LONG_TIMEOUT_MS);
addLayout(R.string.searchview, "searchview",
R.layout.searchview, null, NO_TIMEOUT_MS);
diff --git a/tests/tests/jni/Android.mk b/tests/tests/jni/Android.mk
index 0f9f88b..c8c92fd 100644
--- a/tests/tests/jni/Android.mk
+++ b/tests/tests/jni/Android.mk
@@ -34,7 +34,7 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
# Include the associated library's makefile.
-include $(LOCAL_PATH)/libjnitest/Android.mk
\ No newline at end of file
+include $(LOCAL_PATH)/libjnitest/Android.mk
diff --git a/tests/tests/jni/libjnitest/helper.c b/tests/tests/jni/libjnitest/helper.c
index f974a59..831d5b5 100644
--- a/tests/tests/jni/libjnitest/helper.c
+++ b/tests/tests/jni/libjnitest/helper.c
@@ -58,7 +58,7 @@
JniTestFunction *function = va_arg(args, JniTestFunction *);
- LOGI("running %s", name);
+ ALOGI("running %s", name);
char *oneResult = function(env);
if (oneResult != NULL) {
diff --git a/tests/tests/jni/libjnitest/register.c b/tests/tests/jni/libjnitest/register.c
index d68b536..66eb265 100644
--- a/tests/tests/jni/libjnitest/register.c
+++ b/tests/tests/jni/libjnitest/register.c
@@ -32,25 +32,25 @@
extern int register_InstanceNonce(JNIEnv *);
if (register_InstanceNonce(env)) {
- LOGE("failed to register InstanceNonce");
+ ALOGE("failed to register InstanceNonce");
return JNI_ERR;
}
extern int register_StaticNonce(JNIEnv *);
if (register_StaticNonce(env)) {
- LOGE("failed to register StaticNonce");
+ ALOGE("failed to register StaticNonce");
return JNI_ERR;
}
extern int register_JniCTest(JNIEnv *);
if (register_JniCTest(env)) {
- LOGE("failed to register JniCTest");
+ ALOGE("failed to register JniCTest");
return JNI_ERR;
}
extern int register_JniCppTest(JNIEnv *);
if (register_JniCppTest(env)) {
- LOGE("failed to register JniCppTest");
+ ALOGE("failed to register JniCppTest");
return JNI_ERR;
}
diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index d63d911..b53aaa0 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index df1de12..1a14f83 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordTest.java b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
index a07c704..8be109a 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
@@ -50,6 +50,7 @@
if (!hasMicrophone()) {
return;
}
+
/*
* InstrumentationTestRunner.onStart() calls Looper.prepare(), which creates a looper
* for the current thread. However, since we don't actually call loop() in the test,
diff --git a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
index 504a304..e597827 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
@@ -17,12 +17,12 @@
package android.media.cts;
import android.content.pm.PackageManager;
+import android.cts.util.PollingCheck;
import android.media.AudioFormat;
import android.media.AudioRecord;
import android.media.MediaRecorder.AudioSource;
import android.test.AndroidTestCase;
import android.util.Log;
-import android.view.animation.cts.DelayedCheck;
import java.util.ArrayList;
import java.util.List;
@@ -85,7 +85,7 @@
}
private void checkRecordingState(final int state) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mAudioRecord.getRecordingState() == state;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
new file mode 100644
index 0000000..63822f2
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.media.cts;
+
+import android.media.MediaPlayer;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.SystemClock;
+import android.webkit.cts.CtsTestServer;
+
+import org.apache.http.HttpServerConnection;
+
+import org.apache.http.impl.DefaultHttpServerConnection;
+import org.apache.http.impl.io.SocketOutputBuffer;
+import org.apache.http.io.SessionOutputBuffer;
+import org.apache.http.params.HttpParams;
+import org.apache.http.util.CharArrayBuffer;
+
+import java.io.IOException;
+
+import java.net.Socket;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+
+/**
+ * Executes a range of tests on MediaPlayer while streaming a video
+ * from an HTTP server over a simulated "flaky" network.
+ */
+public class MediaPlayerFlakyNetworkTest extends MediaPlayerTestBase {
+
+ private static final String[] TEST_VIDEOS = {
+ "raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz",
+ "raw/video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz",
+ "raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz",
+ "raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz",
+ "raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz"
+ };
+
+ // Allow operations to block for 2500ms before assuming they will ANR.
+ // We don't allow the full 5s because cpu load, etc, reduces the budget.
+ private static final int ANR_TIMEOUT_MILLIS = 2500;
+
+ private CtsTestServer mServer;
+
+ @Override
+ public void tearDown() throws Exception {
+ releaseMediaPlayer();
+ releaseHttpServer();
+ super.tearDown();
+ }
+
+ public void test_S0P0() throws Throwable {
+ doPlayStreams(0, 0);
+ }
+
+ public void test_S1P000005() throws Throwable {
+ doPlayStreams(1, 0.000005f);
+ }
+
+ public void test_S2P00001() throws Throwable {
+ doPlayStreams(2, 0.00001f);
+ }
+
+ public void test_S3P00001() throws Throwable {
+ doPlayStreams(3, 0.00001f);
+ }
+
+ public void test_S4P00001() throws Throwable {
+ doPlayStreams(4, 0.00001f);
+ }
+
+ public void test_S5P00001() throws Throwable {
+ doPlayStreams(5, 0.00001f);
+ }
+
+ public void test_S6P00002() throws Throwable {
+ doPlayStreams(6, 0.00002f);
+ }
+
+ private void doPlayStreams(int seed, float probability) throws Throwable {
+ Random random = new Random(seed);
+ createHttpServer(seed, probability);
+ for (int i = 0; i < 10; i++) {
+ String video = getRandomTestVideo(random);
+ doPlayMp4Stream(video, 20000, 5000);
+ doAsyncPrepareAndRelease(video);
+ doRandomOperations(video);
+ }
+ doPlayMp4Stream(getRandomTestVideo(random), 30000, 20000);
+ releaseHttpServer();
+ }
+
+ private String getRandomTestVideo(Random random) {
+ return TEST_VIDEOS[random.nextInt(TEST_VIDEOS.length)];
+ }
+
+ private void doPlayMp4Stream(String video, int millisToPrepare, int millisToPlay)
+ throws Throwable {
+ createMediaPlayer();
+ localHttpStreamTest(video);
+
+ mOnPrepareCalled.waitForSignal(millisToPrepare);
+ if (mOnPrepareCalled.isSignalled()) {
+ mMediaPlayer.start();
+ Thread.sleep(millisToPlay);
+ } else {
+ // This could be because the "connection" was too slow. Assume ok.
+ }
+
+ releaseMediaPlayerAndFailIfAnr();
+ }
+
+ private void doAsyncPrepareAndRelease(String video) throws Throwable {
+ Random random = new Random(1);
+ for (int i = 0; i < 10; i++) {
+ createMediaPlayer();
+ localHttpStreamTest(video);
+ Thread.sleep(random.nextInt(500));
+ releaseMediaPlayerAndFailIfAnr();
+ }
+ }
+
+ private void doRandomOperations(String video) throws Throwable {
+ Random random = new Random(1);
+ createMediaPlayer();
+ localHttpStreamTest(video);
+ mOnPrepareCalled.waitForSignal(10000);
+ if (mOnPrepareCalled.isSignalled()) {
+ mMediaPlayer.start();
+ for (int i = 0; i < 50; i++) {
+ Thread.sleep(random.nextInt(100));
+ switch (random.nextInt(3)) {
+ case 0:
+ mMediaPlayer.start();
+ assertTrue(mMediaPlayer.isPlaying());
+ break;
+ case 1:
+ mMediaPlayer.pause();
+ assertFalse(mMediaPlayer.isPlaying());
+ break;
+ case 2:
+ mMediaPlayer.seekTo(random.nextInt(10000));
+ break;
+ }
+ }
+ } else {
+ // Prepare took more than 10s, give up.
+ // This could be because the "connection" was too slow
+ }
+ releaseMediaPlayerAndFailIfAnr();
+ }
+
+ private void releaseMediaPlayerAndFailIfAnr() throws Throwable {
+ final Monitor releaseThreadRunning = new Monitor();
+ Thread releaseThread = new Thread() {
+ public void run() {
+ releaseThreadRunning.signal();
+ releaseMediaPlayer();
+ }
+ };
+ releaseThread.start();
+ releaseThreadRunning.waitForSignal();
+ releaseThread.join(ANR_TIMEOUT_MILLIS);
+ assertFalse("release took longer than " + ANR_TIMEOUT_MILLIS, releaseThread.isAlive());
+ }
+
+ private void createMediaPlayer() throws Throwable {
+ if (mMediaPlayer == null) {
+ mMediaPlayer = createMediaPlayerOnMainThread();
+ }
+ }
+
+ private void releaseMediaPlayer() {
+ MediaPlayer old = mMediaPlayer;
+ mMediaPlayer = null;
+ if (old != null) {
+ old.release();
+ }
+ }
+
+ private MediaPlayer createMediaPlayerOnMainThread() throws Throwable {
+ Callable<MediaPlayer> callable = new Callable<MediaPlayer>() {
+ @Override
+ public MediaPlayer call() throws Exception {
+ return new MediaPlayer();
+ }
+ };
+ FutureTask<MediaPlayer> future = new FutureTask<MediaPlayer>(callable);
+ getInstrumentation().runOnMainSync(future);
+ return future.get();
+ }
+
+
+ private void createHttpServer(int seed, final float probability) throws Throwable {
+ final Random random = new Random(seed);
+ mServer = new CtsTestServer(mContext) {
+ @Override
+ protected DefaultHttpServerConnection createHttpServerConnection() {
+ return new FlakyHttpServerConnection(random, probability);
+ }
+ };
+ }
+
+ private void releaseHttpServer() {
+ if (mServer != null) {
+ mServer.shutdown();
+ mServer = null;
+ }
+ }
+
+ private void localHttpStreamTest(final String name)
+ throws Throwable {
+ String stream_url = mServer.getAssetUrl(name);
+ mMediaPlayer.setDataSource(stream_url);
+
+ mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
+ mMediaPlayer.setScreenOnWhilePlaying(true);
+
+ mOnPrepareCalled.reset();
+ mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+ @Override
+ public void onPrepared(MediaPlayer mp) {
+ mOnPrepareCalled.signal();
+ }
+ });
+
+ mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+ @Override
+ public boolean onError(MediaPlayer mp, int what, int extra) {
+ fail("Media player had error " + what + " playing " + name);
+ return true;
+ }
+ });
+
+ mMediaPlayer.prepareAsync();
+ }
+
+ private class FlakyHttpServerConnection extends DefaultHttpServerConnection {
+
+ private final Random mRandom;
+ private final float mProbability;
+
+ public FlakyHttpServerConnection(Random random, float probability) {
+ mRandom = random;
+ mProbability = probability;
+ }
+
+ @Override
+ protected SessionOutputBuffer createHttpDataTransmitter(
+ Socket socket, int buffersize, HttpParams params) throws IOException {
+ return createSessionOutputBuffer(socket, buffersize, params);
+ }
+
+ SessionOutputBuffer createSessionOutputBuffer(
+ Socket socket, int buffersize, HttpParams params) throws IOException {
+ return new SocketOutputBuffer(socket, buffersize, params) {
+ @Override
+ public void write(byte[] b) throws IOException {
+ write(b, 0, b.length);
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ while (len-- > 0) {
+ write(b[off++]);
+ }
+ }
+
+ @Override
+ public void writeLine(String s) throws IOException {
+ maybeDelayHeader(mProbability);
+ super.writeLine(s);
+ }
+
+ @Override
+ public void writeLine(CharArrayBuffer buffer) throws IOException {
+ maybeDelayHeader(mProbability);
+ super.writeLine(buffer);
+ }
+
+ @Override
+ public void write(int b) throws IOException {
+ maybeDelay(mProbability);
+ super.write(b);
+ }
+
+ private void maybeDelayHeader(float probability) throws IOException {
+ // Increase probability of delay when writing headers to simulate
+ // slow initial connection / server response.
+ maybeDelay(probability * 50);
+ }
+
+ private void maybeDelay(float probability) throws IOException {
+ try {
+ float random = mRandom.nextFloat();
+ if (random < probability) {
+ int sleepTimeMs = 1000 + mRandom.nextInt(5000);
+ Thread.sleep(sleepTimeMs);
+ flush();
+ } else if (random < probability * 100) {
+ Thread.sleep(1);
+ flush();
+ }
+ } catch (InterruptedException e) {
+ // Ignored
+ }
+ }
+
+ };
+ }
+ }
+}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
index 6b6f3d7..0e9d493 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -52,6 +52,22 @@
}
}
+ public synchronized void waitForSignal(long millis) throws InterruptedException {
+ if (millis == 0) {
+ waitForSignal();
+ return;
+ }
+
+ long deadline = System.currentTimeMillis() + millis;
+ while (!signalled) {
+ long delay = deadline - System.currentTimeMillis();
+ if (delay <= 0) {
+ break;
+ }
+ wait(delay);
+ }
+ }
+
public synchronized boolean isSignalled() {
return signalled;
}
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
index cc25d07..2c9fe1a 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
@@ -26,12 +26,12 @@
import android.content.ComponentName;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.media.MediaScannerConnection;
import android.media.MediaScannerConnection.MediaScannerConnectionClient;
import android.net.Uri;
import android.os.IBinder;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.io.File;
import java.io.FileOutputStream;
@@ -157,12 +157,12 @@
}
private void checkMediaScannerConnection() {
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
protected boolean check() {
return mMediaScannerConnectionClient.isOnMediaScannerConnectedCalled;
}
}.run();
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
protected boolean check() {
return mMediaScannerConnectionClient.mediaPath != null;
}
@@ -170,7 +170,7 @@
}
private void checkConnectionState(final boolean expected) {
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
protected boolean check() {
return mMediaScannerConnection.isConnected() == expected;
}
diff --git a/tests/tests/mediastress/Android.mk b/tests/tests/mediastress/Android.mk
index 4fa7fdb..505d123 100644
--- a/tests/tests/mediastress/Android.mk
+++ b/tests/tests/mediastress/Android.mk
@@ -22,10 +22,15 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JNI_SHARED_LIBRARIES := libctsmediastress_jni
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsMediaStressTestCases
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
diff --git a/tests/tests/mediastress/AndroidManifest.xml b/tests/tests/mediastress/AndroidManifest.xml
index 5a4569c..1ee4104 100644
--- a/tests/tests/mediastress/AndroidManifest.xml
+++ b/tests/tests/mediastress/AndroidManifest.xml
@@ -34,6 +34,8 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <activity android:name="android.mediastress.cts.NativeMediaActivity"
+ android:label="NativeMedia" />
</application>
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.cts.mediastress"
diff --git a/tests/tests/mediastress/jni/Android.mk b/tests/tests/mediastress/jni/Android.mk
new file mode 100644
index 0000000..3913b54
--- /dev/null
+++ b/tests/tests/mediastress/jni/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libctsmediastress_jni
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := native-media-jni.cpp
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_CFLAGS += -Isystem/media/wilhelm/include
+
+LOCAL_SHARED_LIBRARIES := libandroid libnativehelper liblog libOpenMAXAL
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/mediastress/jni/native-media-jni.cpp b/tests/tests/mediastress/jni/native-media-jni.cpp
new file mode 100644
index 0000000..8df937f
--- /dev/null
+++ b/tests/tests/mediastress/jni/native-media-jni.cpp
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Original code copied from NDK Native-media sample code */
+
+
+#include <assert.h>
+#include <jni.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+
+// for __android_log_print(ANDROID_LOG_INFO, "YourApp", "formatted message");
+#include <android/log.h>
+#define TAG "NativeMedia"
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
+// for native media
+#include <OMXAL/OpenMAXAL.h>
+#include <OMXAL/OpenMAXAL_Android.h>
+
+// for native window JNI
+#include <android/native_window_jni.h>
+
+// engine interfaces
+static XAObjectItf engineObject = NULL;
+static XAEngineItf engineEngine = NULL;
+
+// output mix interfaces
+static XAObjectItf outputMixObject = NULL;
+
+// streaming media player interfaces
+static XAObjectItf playerObj = NULL;
+static XAPlayItf playerPlayItf = NULL;
+static XAAndroidBufferQueueItf playerBQItf = NULL;
+static XAStreamInformationItf playerStreamInfoItf = NULL;
+static XAVolumeItf playerVolItf = NULL;
+
+// number of required interfaces for the MediaPlayer creation
+#define NB_MAXAL_INTERFACES 3 // XAAndroidBufferQueueItf, XAStreamInformationItf and XAPlayItf
+
+// video sink for the player
+static ANativeWindow* theNativeWindow = NULL;
+
+/**
+ * Macro to clean-up already created stuffs and return JNI_FALSE when cond is not true
+ */
+#define RETURN_ON_ASSERTION_FAILURE(cond, env, clazz) \
+ if (!(cond)) { \
+ LOGE("assertion failure at file %s line %d", __FILE__, __LINE__); \
+ Java_android_mediastress_cts_NativeMediaActivity_shutdown((env), (clazz)); \
+ return JNI_FALSE; \
+ }
+
+// callback invoked whenever there is new or changed stream information
+static void StreamChangeCallback(XAStreamInformationItf caller,
+ XAuint32 eventId,
+ XAuint32 streamIndex,
+ void * pEventData,
+ void * pContext )
+{
+ LOGV("StreamChangeCallback called for stream %u", streamIndex);
+ // pContext was specified as NULL at RegisterStreamChangeCallback and is unused here
+ assert(NULL == pContext);
+ switch (eventId) {
+ case XA_STREAMCBEVENT_PROPERTYCHANGE: {
+ /** From spec 1.0.1:
+ "This event indicates that stream property change has occurred.
+ The streamIndex parameter identifies the stream with the property change.
+ The pEventData parameter for this event is not used and shall be ignored."
+ */
+ XAresult res;
+ XAuint32 domain;
+ res = (*caller)->QueryStreamType(caller, streamIndex, &domain);
+ assert(XA_RESULT_SUCCESS == res);
+ switch (domain) {
+ case XA_DOMAINTYPE_VIDEO: {
+ XAVideoStreamInformation videoInfo;
+ res = (*caller)->QueryStreamInformation(caller, streamIndex, &videoInfo);
+ assert(XA_RESULT_SUCCESS == res);
+ LOGV("Found video size %u x %u, codec ID=%u, frameRate=%u, bitRate=%u, duration=%u ms",
+ videoInfo.width, videoInfo.height, videoInfo.codecId, videoInfo.frameRate,
+ videoInfo.bitRate, videoInfo.duration);
+ } break;
+ default:
+ LOGE("Unexpected domain %u\n", domain);
+ break;
+ }
+ } break;
+ default:
+ LOGE("Unexpected stream event ID %u\n", eventId);
+ break;
+ }
+}
+
+// shut down the native media system
+// force C naming convention for JNI interfaces to avoid registering manually
+extern "C" void Java_android_mediastress_cts_NativeMediaActivity_shutdown(JNIEnv* env,
+ jclass clazz)
+{
+ // destroy streaming media player object, and invalidate all associated interfaces
+ if (playerObj != NULL) {
+ if (playerPlayItf != NULL) {
+ (*playerPlayItf)->SetPlayState(playerPlayItf, XA_PLAYSTATE_STOPPED);
+ }
+ (*playerObj)->Destroy(playerObj);
+ playerObj = NULL;
+ playerPlayItf = NULL;
+ playerBQItf = NULL;
+ playerStreamInfoItf = NULL;
+ playerVolItf = NULL;
+ }
+
+ // destroy output mix object, and invalidate all associated interfaces
+ if (outputMixObject != NULL) {
+ (*outputMixObject)->Destroy(outputMixObject);
+ outputMixObject = NULL;
+ }
+
+ // destroy engine object, and invalidate all associated interfaces
+ if (engineObject != NULL) {
+ (*engineObject)->Destroy(engineObject);
+ engineObject = NULL;
+ engineEngine = NULL;
+ }
+
+ // make sure we don't leak native windows
+ if (theNativeWindow != NULL) {
+ ANativeWindow_release(theNativeWindow);
+ theNativeWindow = NULL;
+ }
+}
+
+// create the engine and output mix objects
+extern "C" jboolean Java_android_mediastress_cts_NativeMediaActivity_createEngine(JNIEnv* env,
+ jclass clazz)
+{
+ XAresult res;
+
+ // create engine
+ res = xaCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // realize the engine
+ res = (*engineObject)->Realize(engineObject, XA_BOOLEAN_FALSE);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // get the engine interface, which is needed in order to create other objects
+ res = (*engineObject)->GetInterface(engineObject, XA_IID_ENGINE, &engineEngine);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // create output mix
+ res = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, NULL, NULL);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // realize the output mix
+ res = (*outputMixObject)->Realize(outputMixObject, XA_BOOLEAN_FALSE);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ return JNI_TRUE;
+}
+
+
+// create streaming media player
+extern "C" jboolean Java_android_mediastress_cts_NativeMediaActivity_createMediaPlayer(JNIEnv* env,
+ jclass clazz, jstring fileUri)
+{
+ XAresult res;
+
+ // convert Java string to UTF-8
+ const char *utf8 = env->GetStringUTFChars(fileUri, NULL);
+ RETURN_ON_ASSERTION_FAILURE((NULL != utf8), env, clazz);
+
+ XADataLocator_URI uri = {XA_DATALOCATOR_URI, (XAchar*) utf8};
+ XADataFormat_MIME format_mime = {
+ XA_DATAFORMAT_MIME, XA_ANDROID_MIME_MP2TS, XA_CONTAINERTYPE_MPEG_TS };
+ XADataSource dataSrc = {&uri, &format_mime};
+
+ // configure audio sink
+ XADataLocator_OutputMix loc_outmix = { XA_DATALOCATOR_OUTPUTMIX, outputMixObject };
+ XADataSink audioSnk = { &loc_outmix, NULL };
+
+ // configure image video sink
+ XADataLocator_NativeDisplay loc_nd = {
+ XA_DATALOCATOR_NATIVEDISPLAY, // locatorType
+ // the video sink must be an ANativeWindow created from a Surface or SurfaceTexture
+ (void*)theNativeWindow, // hWindow
+ // must be NULL
+ NULL // hDisplay
+ };
+ XADataSink imageVideoSink = {&loc_nd, NULL};
+
+ // declare interfaces to use
+ XAboolean required[NB_MAXAL_INTERFACES]
+ = {XA_BOOLEAN_TRUE, XA_BOOLEAN_TRUE, XA_BOOLEAN_TRUE};
+ XAInterfaceID iidArray[NB_MAXAL_INTERFACES]
+ = {XA_IID_PLAY,
+ XA_IID_ANDROIDBUFFERQUEUESOURCE,
+ XA_IID_STREAMINFORMATION};
+
+ // create media player
+ res = (*engineEngine)->CreateMediaPlayer(engineEngine, &playerObj, &dataSrc,
+ NULL, &audioSnk, &imageVideoSink, NULL, NULL,
+ NB_MAXAL_INTERFACES /*XAuint32 numInterfaces*/,
+ iidArray /*const XAInterfaceID *pInterfaceIds*/,
+ required /*const XAboolean *pInterfaceRequired*/);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // release the Java string and UTF-8
+ env->ReleaseStringUTFChars(fileUri, utf8);
+
+ // realize the player
+ res = (*playerObj)->Realize(playerObj, XA_BOOLEAN_FALSE);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // get the play interface
+ res = (*playerObj)->GetInterface(playerObj, XA_IID_PLAY, &playerPlayItf);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // get the stream information interface (for video size)
+ res = (*playerObj)->GetInterface(playerObj, XA_IID_STREAMINFORMATION, &playerStreamInfoItf);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // get the volume interface
+ res = (*playerObj)->GetInterface(playerObj, XA_IID_VOLUME, &playerVolItf);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // we want to be notified of the video size once it's found, so we register a callback for that
+ res = (*playerStreamInfoItf)->RegisterStreamChangeCallback(playerStreamInfoItf,
+ StreamChangeCallback, NULL);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // prepare the player
+ res = (*playerPlayItf)->SetPlayState(playerPlayItf, XA_PLAYSTATE_PAUSED);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // set the volume
+ res = (*playerVolItf)->SetVolumeLevel(playerVolItf, 0);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ // start the playback
+ res = (*playerPlayItf)->SetPlayState(playerPlayItf, XA_PLAYSTATE_PLAYING);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+
+ return JNI_TRUE;
+}
+
+
+// set the playing state for the streaming media player
+extern "C" jboolean Java_android_mediastress_cts_NativeMediaActivity_playOrPauseMediaPlayer(
+ JNIEnv* env, jclass clazz, jboolean play)
+{
+ XAresult res;
+
+ // make sure the streaming media player was created
+ RETURN_ON_ASSERTION_FAILURE((NULL != playerPlayItf), env, clazz);
+ // set the player's state
+ res = (*playerPlayItf)->SetPlayState(playerPlayItf, play ?
+ XA_PLAYSTATE_PLAYING : XA_PLAYSTATE_PAUSED);
+ RETURN_ON_ASSERTION_FAILURE((XA_RESULT_SUCCESS == res), env, clazz);
+ return JNI_TRUE;
+}
+
+// set the surface
+extern "C" jboolean Java_android_mediastress_cts_NativeMediaActivity_setSurface(JNIEnv *env,
+ jclass clazz, jobject surface)
+{
+ // obtain a native window from a Java surface
+ theNativeWindow = ANativeWindow_fromSurface(env, surface);
+ return JNI_TRUE;
+}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java
new file mode 100644
index 0000000..6a34f88
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Original code copied from NDK Native-media sample code */
+package android.mediastress.cts;
+
+import android.app.Activity;
+import android.graphics.SurfaceTexture;
+import android.media.CamcorderProfile;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Surface;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
+
+public class NativeMediaActivity extends Activity implements OnSurfaceChangedListener {
+ public static final String EXTRA_VIDEO_QUALITY = "videoQuality";
+ // should be long enough. time-out can be treated as error
+ public static final long NATIVE_MEDIA_LIFECYCLE_TIMEOUT_MS = 10000;
+ static final String TAG = "NativeMedia";
+ static final String[] MEDIA = {
+ "bbb_short/480x360/mp4_libx264_libfaac/" +
+ "bbb_short.ffmpeg.480x360.mp4.libx264_1000kbps_30fps.libfaac_stereo_192kbps_44100Hz.ts",
+ "bbb_short/720x480/mp4_libx264_libfaac/" +
+ "bbb_short.ffmpeg.720x480.mp4.libx264_1000kbps_30fps.libfaac_stereo_192kbps_44100Hz.ts",
+ "bbb_short/1280x720/mp4_libx264_libfaac/" +
+ "bbb_short.ffmpeg.1280x720.mp4.libx264_1000kbps_30fps.libfaac_stereo_192kbps_44100Hz.ts",
+ "bbb_short/1920x1080/mp4_libx264_libfaac/" +
+ "bbb_short.ffmpeg.1920x1080.mp4.libx264_5000kbps_30fps.libfaac_stereo_192kbps_48000Hz.ts"
+ };
+
+ private SurfaceTextureGLSurfaceView mGLView;
+ private volatile boolean mNativeCreated = false;
+ /** 0 for default (480x360), other value can be CamcorderProfile.QUALITY_480P / 720P / 1080P */
+ private int mVideoQuality = 0;
+ // native media status queued whenever there is a change in life.
+ private final BlockingQueue<Boolean> mNativeWaitQ = new LinkedBlockingQueue<Boolean>();
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ mVideoQuality = getIntent().getIntExtra(EXTRA_VIDEO_QUALITY, mVideoQuality);
+ mGLView = new SurfaceTextureGLSurfaceView(this, this);
+ setContentView(mGLView);
+ }
+
+ /**
+ * should be called by GLThread after GlSurface is created.
+ */
+ @Override
+ public void onSurfaceCreated() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ Log.i(TAG, "onSurfaceCreated create engine");
+ // initialize native media system
+ Assert.assertTrue(createEngine());
+ Assert.assertTrue(setSurfaceForNative());
+ String fileName = getMediaString();
+ Log.i(TAG, "start playing " + fileName);
+ Assert.assertTrue(createMediaPlayer("file:///" + fileName));
+ mNativeCreated = true;
+ mNativeWaitQ.add(mNativeCreated);
+ }
+ });
+ }
+
+ /**
+ * should be called inside main thread
+ */
+ @Override
+ public void onSurfaceDestroyed() {
+ shutdownIfActive();
+ }
+
+ /**
+ * check if native media is alive. If it does not become alive
+ * for more than certain time, assertion fail will happen.
+ * @return the status of native media, true if it is alive, null if timed-out
+ * @throws InterruptedException
+ */
+ public Boolean waitForNativeMediaLifeCycle() throws InterruptedException {
+ return mNativeWaitQ.poll(NATIVE_MEDIA_LIFECYCLE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ protected void onPause() {
+ //GLSurfaceView destroys surface on pause. so shutdown should be done.
+ shutdownIfActive();
+ mGLView.onPause();
+ super.onPause();
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mGLView.onResume();
+ if (mNativeCreated) {
+ Assert.assertTrue(playOrPauseMediaPlayer(true));
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (mNativeCreated) {
+ shutdown();
+ }
+ super.onDestroy();
+ }
+
+ private void shutdownIfActive() {
+ if (mNativeCreated) {
+ Log.i(TAG, "shutdownIfActive shutdown");
+ // surface no longer available, so just shutdown
+ shutdown();
+ mNativeCreated = false;
+ mNativeWaitQ.add(mNativeCreated);
+ }
+ }
+
+ private boolean setSurfaceForNative() {
+ SurfaceTexture st = mGLView.getSurfaceTexture();
+ Assert.assertNotNull(st);
+ Surface s = new Surface(st);
+ boolean res = setSurface(s);
+ s.release();
+ return res;
+ }
+
+ private String getMediaString() {
+ int mediaIndex = 0; // default: 480x360
+ switch(mVideoQuality) {
+ case CamcorderProfile.QUALITY_1080P:
+ mediaIndex = 3;
+ break;
+ case CamcorderProfile.QUALITY_720P:
+ mediaIndex = 2;
+ break;
+ case CamcorderProfile.QUALITY_480P:
+ mediaIndex = 1;
+ break;
+ }
+ return WorkDir.getMediaDirString() + MEDIA[mediaIndex];
+ }
+
+ /**
+ * creates OpenMaxAl Engine
+ */
+ public static native boolean createEngine();
+ /**
+ * set surface to render. should be called before creating Media player
+ * @param surface
+ */
+ public static native boolean setSurface(Surface surface);
+
+ public static native boolean createMediaPlayer(String fileUri);
+ public static native boolean playOrPauseMediaPlayer(boolean play);
+ public static native void shutdown();
+
+ /** Load jni on initialization */
+ static {
+ System.loadLibrary("ctsmediastress_jni");
+ }
+
+}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
new file mode 100644
index 0000000..f3bbc40
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.mediastress.cts;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.media.CamcorderProfile;
+import android.media.MediaRecorder.AudioEncoder;
+import android.media.MediaRecorder.VideoEncoder;
+import android.os.Environment;
+import android.test.ActivityInstrumentationTestCase2;
+
+import junit.framework.Assert;
+
+public class NativeMediaTest extends ActivityInstrumentationTestCase2<NativeMediaActivity> {
+ private static final int NUMBER_PLAY_PAUSE_REPEATITIONS = 10;
+ private static final long PLAY_WAIT_TIME_MS = 4000;
+
+ public NativeMediaTest() {
+ super(NativeMediaActivity.class);
+ }
+
+ public void test1080pPlay() throws InterruptedException {
+ runPlayTest(CamcorderProfile.QUALITY_1080P);
+ }
+
+ public void test720pPlay() throws InterruptedException {
+ runPlayTest(CamcorderProfile.QUALITY_720P);
+ }
+
+ public void test480pPlay() throws InterruptedException {
+ runPlayTest(CamcorderProfile.QUALITY_480P);
+ }
+
+ public void testDefaultPlay() throws InterruptedException {
+ runPlayTest(0);
+ }
+
+ private void runPlayTest(int quality) throws InterruptedException {
+ if (quality != 0) {
+ if (!isResolutionSupported(quality)) {
+ return;
+ }
+ }
+ Intent intent = new Intent();
+ intent.putExtra(NativeMediaActivity.EXTRA_VIDEO_QUALITY,
+ quality);
+ setActivityIntent(intent);
+ final NativeMediaActivity activity = getActivity();
+ final Instrumentation instrumentation = getInstrumentation();
+ waitForNativeMediaLifeCycle(activity, true);
+ Thread.sleep(PLAY_WAIT_TIME_MS); // let it play for some time
+ for (int i = 0; i < NUMBER_PLAY_PAUSE_REPEATITIONS; i++) {
+ instrumentation.callActivityOnPause(activity);
+ instrumentation.waitForIdleSync();
+ waitForNativeMediaLifeCycle(activity, false);
+ instrumentation.callActivityOnResume(activity);
+ waitForNativeMediaLifeCycle(activity, true);
+ Thread.sleep(PLAY_WAIT_TIME_MS); // let it play for some time
+ }
+ }
+
+ /**
+ * wait until life cycle change and checks if the current status is in line with expectation
+ * @param activity
+ * @param expectAlive expected status, true if it should be alive.
+ * @throws InterruptedException
+ */
+ private void waitForNativeMediaLifeCycle(NativeMediaActivity activity, boolean expectAlive)
+ throws InterruptedException {
+ Boolean status = activity.waitForNativeMediaLifeCycle();
+ Assert.assertNotNull(status); // null means time-out
+ Assert.assertEquals(expectAlive, status.booleanValue());
+ }
+
+ private boolean isResolutionSupported(int quality) {
+ Assert.assertEquals(Environment.getExternalStorageState(), Environment.MEDIA_MOUNTED);
+ if (!CamcorderProfile.hasProfile(quality)) {
+ return false;
+ }
+ CamcorderProfile profile = CamcorderProfile.get(quality);
+ if ((profile != null) && (profile.videoCodec == VideoEncoder.H264) &&
+ (profile.audioCodec == AudioEncoder.AAC)) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/OnSurfaceChangedListener.java b/tests/tests/mediastress/src/android/mediastress/cts/OnSurfaceChangedListener.java
new file mode 100644
index 0000000..f4a2c0d
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/OnSurfaceChangedListener.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.mediastress.cts;
+
+interface OnSurfaceChangedListener {
+ void onSurfaceCreated();
+ void onSurfaceDestroyed();
+}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/SurfaceTextureGLSurfaceView.java b/tests/tests/mediastress/src/android/mediastress/cts/SurfaceTextureGLSurfaceView.java
new file mode 100644
index 0000000..6d89652
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/SurfaceTextureGLSurfaceView.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Original code copied from NDK Native-media sample code */
+
+package android.mediastress.cts;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.opengl.GLSurfaceView;
+import android.util.AttributeSet;
+import android.view.SurfaceHolder;
+
+public class SurfaceTextureGLSurfaceView extends GLSurfaceView {
+
+ private SurfaceTextureRenderer mRenderer;
+ private final OnSurfaceChangedListener mListener;
+
+ public SurfaceTextureGLSurfaceView(Context context, OnSurfaceChangedListener listener) {
+ this(context, null, listener);
+ }
+
+ public SurfaceTextureGLSurfaceView(Context context, AttributeSet attributeSet,
+ OnSurfaceChangedListener listener) {
+ super(context, attributeSet);
+ mListener = listener;
+ init(listener);
+ }
+
+ private void init(OnSurfaceChangedListener listener) {
+ setEGLContextClientVersion(2);
+ mRenderer = new SurfaceTextureRenderer(listener);
+ setRenderer(mRenderer);
+ }
+
+ public SurfaceTexture getSurfaceTexture() {
+ return mRenderer.getSurfaceTexture();
+ }
+
+ @Override
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ // ugly but renderer has no notification for surfaceDestroyed.
+ if (mListener != null) {
+ // surface destroyed long time ago, but let existing stuffs cleared
+ mListener.onSurfaceDestroyed();
+ }
+ super.surfaceDestroyed(holder);
+ }
+}
+
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/SurfaceTextureRenderer.java b/tests/tests/mediastress/src/android/mediastress/cts/SurfaceTextureRenderer.java
new file mode 100644
index 0000000..4c2af8b
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/SurfaceTextureRenderer.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Original code copied from NDK Native-media sample code */
+package android.mediastress.cts;
+
+import android.graphics.SurfaceTexture;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.opengl.Matrix;
+import android.util.Log;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import junit.framework.Assert;
+
+class SurfaceTextureRenderer implements GLSurfaceView.Renderer, SurfaceTexture.OnFrameAvailableListener {
+ private static final String TAG = "SurfaceTextureRenderer";
+ // Magic key
+ private static final int GL_TEXTURE_EXTERNAL_OES = 0x8D65;
+ private static final int FLOAT_SIZE_BYTES = 4;
+ private static final int VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
+ private static final int VERTICES_DATA_POS_OFFSET = 0;
+ private static final int VERTICES_DATA_UV_OFFSET = 3;
+ private final float[] mVerticesData = {
+ // X, Y, Z, U, V
+ -1.0f, -1.0f, 0, 0.f, 0.f,
+ 1.0f, -1.0f, 0, 1.f, 0.f,
+ -1.0f, 1.0f, 0, 0.f, 1.f,
+ 1.0f, 1.0f, 0, 1.f, 1.f,
+ };
+
+ private FloatBuffer mVertices;
+
+ private final String mVertexShader =
+ "uniform mat4 uMVPMatrix;\n" +
+ "uniform mat4 uSTMatrix;\n" +
+ "attribute vec4 aPosition;\n" +
+ "attribute vec4 aTextureCoord;\n" +
+ "varying vec2 vTextureCoord;\n" +
+ "void main() {\n" +
+ " gl_Position = uMVPMatrix * aPosition;\n" +
+ " vTextureCoord = (uSTMatrix * aTextureCoord).xy;\n" +
+ "}\n";
+
+ private final String mFragmentShader =
+ "#extension GL_OES_EGL_image_external : require\n" +
+ "precision mediump float;\n" +
+ "varying vec2 vTextureCoord;\n" +
+ "uniform samplerExternalOES sTexture;\n" +
+ "void main() {\n" +
+ " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
+ "}\n";
+
+ private float[] mMVPMatrix = new float[16];
+ private float[] mProjMatrix = new float[16];
+ private float[] mMMatrix = new float[16];
+ private float[] mVMatrix = new float[16];
+ private float[] mSTMatrix = new float[16];
+
+ private int mProgram;
+ private int mTextureID;
+ private int muMVPMatrixHandle;
+ private int muSTMatrixHandle;
+ private int maPositionHandle;
+ private int maTextureHandle;
+
+ private float mRatio = 1.0f;
+ private SurfaceTexture mSurface = null;
+ private boolean updateSurface = false;
+
+ private final OnSurfaceChangedListener mListener;
+
+ public SurfaceTextureRenderer(OnSurfaceChangedListener listener) {
+ mListener = listener;
+ mVertices = ByteBuffer.allocateDirect(mVerticesData.length
+ * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+ mVertices.put(mVerticesData).position(0);
+
+ Matrix.setIdentityM(mSTMatrix, 0);
+ Matrix.setIdentityM(mMMatrix, 0);
+ Matrix.rotateM(mMMatrix, 0, 20, 0, 1, 0);
+ }
+
+ public void onDrawFrame(GL10 glUnused) {
+ synchronized(this) {
+ if (updateSurface) {
+ mSurface.updateTexImage();
+
+ mSurface.getTransformMatrix(mSTMatrix);
+ updateSurface = false;
+ }
+ }
+
+ // Ignore the passed-in GL10 interface, and use the GLES20
+ // class's static methods instead.
+ GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
+ GLES20.glUseProgram(mProgram);
+ checkGlError("glUseProgram");
+
+ GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+ GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
+
+ mVertices.position(VERTICES_DATA_POS_OFFSET);
+ GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
+ VERTICES_DATA_STRIDE_BYTES, mVertices);
+ checkGlError("glVertexAttribPointer maPosition");
+ GLES20.glEnableVertexAttribArray(maPositionHandle);
+ checkGlError("glEnableVertexAttribArray maPositionHandle");
+
+ mVertices.position(VERTICES_DATA_UV_OFFSET);
+ GLES20.glVertexAttribPointer(maTextureHandle, 3, GLES20.GL_FLOAT, false,
+ VERTICES_DATA_STRIDE_BYTES, mVertices);
+ checkGlError("glVertexAttribPointer maTextureHandle");
+ GLES20.glEnableVertexAttribArray(maTextureHandle);
+ checkGlError("glEnableVertexAttribArray maTextureHandle");
+
+ Matrix.multiplyMM(mMVPMatrix, 0, mVMatrix, 0, mMMatrix, 0);
+ Matrix.multiplyMM(mMVPMatrix, 0, mProjMatrix, 0, mMVPMatrix, 0);
+
+ GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
+ GLES20.glUniformMatrix4fv(muSTMatrixHandle, 1, false, mSTMatrix, 0);
+
+ GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
+ checkGlError("glDrawArrays");
+ }
+
+ public void onSurfaceChanged(GL10 glUnused, int width, int height) {
+ // Ignore the passed-in GL10 interface, and use the GLES20
+ // class's static methods instead.
+ GLES20.glViewport(0, 0, width, height);
+ mRatio = (float) width / height;
+ Matrix.frustumM(mProjMatrix, 0, -mRatio, mRatio, -1, 1, 3, 7);
+ }
+
+ public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+ String extensions = GLES20.glGetString(GLES20.GL_EXTENSIONS);
+ Log.i(TAG, "Gl extensions: " + extensions);
+ Assert.assertTrue(extensions.contains("OES_EGL_image_external"));
+
+ /* Set up alpha blending and an Android background color */
+ GLES20.glEnable(GLES20.GL_BLEND);
+ GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
+ GLES20.glClearColor(0.643f, 0.776f, 0.223f, 1.0f);
+
+ /* Set up shaders and handles to their variables */
+ mProgram = createProgram(mVertexShader, mFragmentShader);
+ if (mProgram == 0) {
+ return;
+ }
+ maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
+ checkGlError("glGetAttribLocation aPosition");
+ if (maPositionHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for aPosition");
+ }
+ maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
+ checkGlError("glGetAttribLocation aTextureCoord");
+ if (maTextureHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for aTextureCoord");
+ }
+
+ muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
+ checkGlError("glGetUniformLocation uMVPMatrix");
+ if (muMVPMatrixHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for uMVPMatrix");
+ }
+
+ muSTMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uSTMatrix");
+ checkGlError("glGetUniformLocation uSTMatrix");
+ if (muMVPMatrixHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for uSTMatrix");
+ }
+
+ checkGlError("glGetUniformLocation uCRatio");
+ if (muMVPMatrixHandle == -1) {
+ throw new RuntimeException("Could not get attrib location for uCRatio");
+ }
+
+ /*
+ * Create our texture. This has to be done each time the
+ * surface is created.
+ */
+
+ int[] textures = new int[1];
+ GLES20.glGenTextures(1, textures, 0);
+
+ mTextureID = textures[0];
+ GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
+ checkGlError("glBindTexture mTextureID");
+
+ GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER,
+ GLES20.GL_NEAREST);
+ GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MAG_FILTER,
+ GLES20.GL_LINEAR);
+ // Clamp to edge is the only option
+ GLES20.glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_S,
+ GLES20.GL_CLAMP_TO_EDGE);
+ GLES20.glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_T,
+ GLES20.GL_CLAMP_TO_EDGE);
+ checkGlError("glTexParameteri mTextureID");
+
+ if (mSurface != null) {
+ mSurface.release();
+ }
+ mSurface = new SurfaceTexture(mTextureID);
+ mSurface.setOnFrameAvailableListener(this);
+
+ Matrix.setLookAtM(mVMatrix, 0, 0, 0, 4f, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
+
+ synchronized(this) {
+ updateSurface = false;
+ }
+ if (mListener != null) {
+ mListener.onSurfaceCreated();
+ }
+ }
+
+ synchronized public void onFrameAvailable(SurfaceTexture surface) {
+ /* For simplicity, SurfaceTexture calls here when it has new
+ * data available. Call may come in from some random thread,
+ * so let's be safe and use synchronize. No OpenGL calls can be done here.
+ */
+ updateSurface = true;
+ }
+
+ private int loadShader(int shaderType, String source) {
+ int shader = GLES20.glCreateShader(shaderType);
+ if (shader != 0) {
+ GLES20.glShaderSource(shader, source);
+ GLES20.glCompileShader(shader);
+ int[] compiled = new int[1];
+ GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
+ if (compiled[0] == 0) {
+ Log.e(TAG, "Could not compile shader " + shaderType + ":");
+ Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
+ GLES20.glDeleteShader(shader);
+ shader = 0;
+ }
+ }
+ return shader;
+ }
+
+ private int createProgram(String vertexSource, String fragmentSource) {
+ int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
+ if (vertexShader == 0) {
+ return 0;
+ }
+ int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
+ if (pixelShader == 0) {
+ return 0;
+ }
+
+ int program = GLES20.glCreateProgram();
+ if (program != 0) {
+ GLES20.glAttachShader(program, vertexShader);
+ checkGlError("glAttachShader");
+ GLES20.glAttachShader(program, pixelShader);
+ checkGlError("glAttachShader");
+ GLES20.glLinkProgram(program);
+ int[] linkStatus = new int[1];
+ GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
+ if (linkStatus[0] != GLES20.GL_TRUE) {
+ Log.e(TAG, "Could not link program: ");
+ Log.e(TAG, GLES20.glGetProgramInfoLog(program));
+ GLES20.glDeleteProgram(program);
+ program = 0;
+ }
+ }
+ return program;
+ }
+
+ private void checkGlError(String op) {
+ int error;
+ while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+ Log.e(TAG, op + ": glError " + error);
+ throw new RuntimeException(op + ": glError " + error);
+ }
+ }
+
+ public SurfaceTexture getSurfaceTexture() {
+ return mSurface;
+ }
+}
diff --git a/tests/tests/nativemedia/Android.mk b/tests/tests/nativemedia/Android.mk
index 94bc83e..5053e7d 100644
--- a/tests/tests/nativemedia/Android.mk
+++ b/tests/tests/nativemedia/Android.mk
@@ -1,35 +1 @@
-# Build the unit tests.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_C_INCLUDES:= \
- bionic \
- bionic/libstdc++/include \
- external/gtest/include \
- system/media/wilhelm/include \
- external/stlport/stlport \
- system/media/wilhelm/src/ut
-
-LOCAL_SRC_FILES:= \
- src/SLObjectCreationTest.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libOpenSLES \
- libstlport
-
-LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT \
- libgtest
-
-LOCAL_CFLAGS += -DXP_UNIX
-
-LOCAL_MODULE := CtsNativeMediaTestCases
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
-
-LOCAL_CTS_TEST_PACKAGE := android.nativemedia
-include $(BUILD_CTS_EXECUTABLE)
+include $(call all-subdir-makefiles)
diff --git a/tests/tests/nativemedia/sl/Android.mk b/tests/tests/nativemedia/sl/Android.mk
new file mode 100644
index 0000000..9c1476b
--- /dev/null
+++ b/tests/tests/nativemedia/sl/Android.mk
@@ -0,0 +1,33 @@
+# Build the unit tests.
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_C_INCLUDES:= \
+ bionic \
+ bionic/libstdc++/include \
+ external/gtest/include \
+ system/media/wilhelm/include \
+ external/stlport/stlport \
+ system/media/wilhelm/src/ut
+
+LOCAL_SRC_FILES:= \
+ src/SLObjectCreationTest.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libutils \
+ libOpenSLES \
+ libstlport
+
+LOCAL_STATIC_LIBRARIES := \
+ libOpenSLESUT \
+ libgtest
+
+LOCAL_MODULE:= NativeMediaTest_SL
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
+
+LOCAL_CTS_TEST_PACKAGE := android.nativemedia.sl
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/tests/tests/nativemedia/sl/src/SLObjectCreationTest.cpp b/tests/tests/nativemedia/sl/src/SLObjectCreationTest.cpp
new file mode 100644
index 0000000..450b32e
--- /dev/null
+++ b/tests/tests/nativemedia/sl/src/SLObjectCreationTest.cpp
@@ -0,0 +1,370 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Test for testing the creation of OpenSL ES objects under various configurations (determined
+ * by their data source and sink types) that are expected to be supported.
+ * The tests verify the creation and completion of the call to Realize() for the following objects:
+ * - Engine
+ * - OutputMix
+ * - AudioPlayer:
+ * * source is URI
+ * * source is FD
+ * * source is BufferQueue of PCM buffers
+ * * source is AndroidBufferQueue of MP2TS buffers
+ * * source is URI, sink is BufferQueue of PCM buffers
+ * * source is FD, sink is BufferQueue of PCM buffers
+ * * source is AndroidBufferQueue of AAC ADTS buffers, sink is BufferQueue of PCM buffers
+ * - AudioRecorder
+ * * source is IO device, sink is BufferQueue of PCM buffers
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_TAG "SLObjectCreationTest"
+
+#include <utils/Log.h>
+#include "SLES/OpenSLES.h"
+#include "SLES/OpenSLES_Android.h"
+#include "OpenSLESUT.h"
+#include <gtest/gtest.h>
+
+//-----------------------------------------------------------------
+/* Checks for error and displays the error code if any */
+bool IsOk(SLresult res) {
+ if (SL_RESULT_SUCCESS != res) {
+ const char *str = slesutResultToString(res);
+ if (NULL == str)
+ str = "unknown";
+ fprintf(stderr, "IsOk failure: %s (0x%x), exiting\n", str, res);
+ return false;
+ }
+ return true;
+}
+
+//-----------------------------------------------------------------
+class SLObjectCreationTest : public ::testing::Test {
+
+protected:
+ SLresult res;
+ SLObjectItf engineObj, outputMixObj, audioPlayerObj;
+ SLEngineItf engineItf;
+
+ SLDataSource audioSource;
+ SLDataSink audioSink;
+ SLDataLocator_URI locatorUriSrc;
+ SLDataLocator_AndroidBufferQueue locatorAbqSrc;
+ SLDataLocator_AndroidFD locatorFdSrc;
+ SLDataFormat_MIME formatMimeSrc;
+
+ SLDataLocator_OutputMix locatorOutputmixSnk;
+ SLDataLocator_AndroidSimpleBufferQueue locatorBqSnk;
+ SLDataFormat_PCM formatPcmSnk;
+
+ SLObjectCreationTest() { }
+
+ virtual ~SLObjectCreationTest() { }
+
+ /* Test setup*/
+ virtual void SetUp() {
+ ALOGV("Test Setup()");
+ res = SL_RESULT_UNKNOWN_ERROR;
+ engineItf = NULL;
+ engineObj = NULL;
+ outputMixObj = NULL;
+ audioPlayerObj = NULL;
+ // Engine creation
+ res = slCreateEngine(&engineObj, 0, NULL, 0, NULL, NULL);
+ ASSERT_TRUE(IsOk(res));
+ res = (*engineObj)->Realize(engineObj, SL_BOOLEAN_FALSE);
+ ASSERT_TRUE(IsOk(res));
+ res = (*engineObj)->GetInterface(engineObj, SL_IID_ENGINE, &engineItf);
+ ASSERT_TRUE(IsOk(res));
+ ASSERT_TRUE(NULL != engineItf);
+ }
+
+ virtual void TearDown() {
+ ALOGV("Test TearDown()");
+ if (audioPlayerObj) {
+ (*audioPlayerObj)->Destroy(audioPlayerObj);
+ audioPlayerObj = NULL;
+ }
+ if (outputMixObj) {
+ (*outputMixObj)->Destroy(outputMixObj);
+ outputMixObj = NULL;
+ }
+ if (engineObj){
+ (*engineObj)->Destroy(engineObj);
+ engineObj = NULL;
+ }
+ }
+
+ //---------------------------------------------------------------------------------------------
+ // Test implementation convenience methods (to avoid code duplication)
+
+ void AudioPlayerCreation() {
+ res = (*engineItf)->CreateAudioPlayer(engineItf, &audioPlayerObj,
+ &audioSource, &audioSink, 0, NULL/*iidArray*/, NULL/*required*/);
+ ASSERT_TRUE(IsOk(res));
+ ASSERT_TRUE(NULL != audioPlayerObj);
+ res = (*audioPlayerObj)->Realize(audioPlayerObj, SL_BOOLEAN_FALSE);
+ ASSERT_TRUE(IsOk(res));
+ }
+
+ void OutputMixSinkInitialization() {
+ locatorOutputmixSnk.locatorType = SL_DATALOCATOR_OUTPUTMIX;
+ locatorOutputmixSnk.outputMix = outputMixObj; // created in OutputMixCreation()
+ audioSink.pLocator = &locatorOutputmixSnk;
+ audioSink.pFormat = NULL;
+ }
+
+ void UriSourceInitialization() {
+ locatorUriSrc.locatorType = SL_DATALOCATOR_URI;
+ locatorUriSrc.URI = (SLchar*) "/dummyPath/dummyFile.mp3";
+ formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
+ formatMimeSrc.mimeType = (SLchar *) NULL;
+ formatMimeSrc.containerType = SL_CONTAINERTYPE_UNSPECIFIED;
+ audioSource.pLocator = &locatorUriSrc;
+ audioSource.pFormat = &formatMimeSrc;
+ }
+
+ void FdSourceInitialization() {
+ locatorFdSrc.locatorType = SL_DATALOCATOR_ANDROIDFD;
+ locatorFdSrc.fd = (SLint32) 1;// a positive value to fake a valid FD
+ locatorFdSrc.length = 10;
+ locatorFdSrc.offset = 0;
+ formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
+ formatMimeSrc.mimeType = (SLchar *) NULL;
+ formatMimeSrc.containerType = SL_CONTAINERTYPE_UNSPECIFIED;
+ audioSource.pLocator = &locatorFdSrc;
+ audioSource.pFormat = &formatMimeSrc;
+ }
+
+ void PcmBqSinkInitialization() {
+ locatorBqSnk.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
+ locatorBqSnk.numBuffers = 16;
+ formatPcmSnk.formatType = SL_DATAFORMAT_PCM;
+ formatPcmSnk.numChannels = 1;
+ formatPcmSnk.samplesPerSec = SL_SAMPLINGRATE_8;
+ formatPcmSnk.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16;
+ formatPcmSnk.containerSize = 16;
+ formatPcmSnk.channelMask = SL_SPEAKER_FRONT_LEFT;
+ formatPcmSnk.endianness = SL_BYTEORDER_LITTLEENDIAN;
+ audioSink.pLocator = (void *) &locatorBqSnk;
+ audioSink.pFormat = (void *) &formatPcmSnk;
+ }
+
+ //---------------------------------------------------------------------------------------------
+ // Tests
+
+ /* Test case for creating an AudioPlayer object */
+ void OutputMixCreation() {
+ res = (*engineItf)->CreateOutputMix(engineItf, &outputMixObj,
+ 0, NULL/*iidArray*/, NULL/*required*/);
+ ASSERT_TRUE(IsOk(res));
+ ASSERT_TRUE(NULL != outputMixObj);
+ res = (*outputMixObj)->Realize(outputMixObj, SL_BOOLEAN_FALSE);
+ ASSERT_TRUE(IsOk(res));
+ }
+
+ /* Test case for creating an AudioPlayer object that plays from a URI */
+ void AudioPlayerFromUriCreation() {
+ // source: URI
+ UriSourceInitialization();
+ // sink: OutputMix
+ OutputMixSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioPlayer object that plays from a FD */
+ void AudioPlayerFromFdCreation() {
+ // source: FD
+ FdSourceInitialization();
+ // sink: OutputMix
+ OutputMixSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioPlayer object that plays from a PCM BufferQueue */
+ void AudioPlayerFromPcmBqCreation() {
+ // source: PCM BufferQueue
+ SLDataLocator_BufferQueue locatorBufferQueue;
+ locatorBufferQueue.locatorType = SL_DATALOCATOR_BUFFERQUEUE;
+ locatorBufferQueue.numBuffers = 16;
+ SLDataFormat_PCM pcm;
+ pcm.formatType = SL_DATAFORMAT_PCM;
+ pcm.numChannels = 2;
+ pcm.samplesPerSec = SL_SAMPLINGRATE_44_1;
+ pcm.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16;
+ pcm.containerSize = 16;
+ pcm.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
+ pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
+ audioSource.pLocator = &locatorBufferQueue;
+ audioSource.pFormat = &pcm;
+
+ // sink: OutputMix
+ OutputMixSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioPlayer object that plays from Transport Stream ABQ */
+ void AudioPlayerFromTsAbqCreation() {
+ // source: transport stream in an AndroidBufferQueue
+ locatorAbqSrc.locatorType = SL_DATALOCATOR_ANDROIDBUFFERQUEUE;
+ locatorAbqSrc.numBuffers = 16;
+ formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
+ formatMimeSrc.mimeType = (SLchar *) "video/mp2ts";
+ formatMimeSrc.containerType = SL_CONTAINERTYPE_MPEG_TS;
+ audioSource.pFormat = (void *)&formatMimeSrc;
+ audioSource.pLocator = (void *)&locatorAbqSrc;
+
+ // sink: OutputMix
+ OutputMixSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioPlayer object that decodes from a URI to a PCM BQ */
+ void AudioPlayerFromUriToPcmBqCreation() {
+ // source: URI
+ UriSourceInitialization();
+ // sink: PCM BufferQueue
+ PcmBqSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioPlayer object that decodes from a FD to a PCM BQ */
+ void AudioPlayerFromFdToPcmBqCreation() {
+ // source: FD
+ FdSourceInitialization();
+ // sink: PCM BufferQueue
+ PcmBqSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioPlayer object that decodes from a ADTS ABQ to a PCM BQ */
+ void AudioPlayerFromAdtsAbqToPcmBqCreation() {
+ // source: ADTS AndroidBufferQueue
+ locatorAbqSrc.locatorType = SL_DATALOCATOR_ANDROIDBUFFERQUEUE;
+ locatorAbqSrc.numBuffers = 16;
+ formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
+ formatMimeSrc.mimeType = (SLchar *)"audio/aac-adts";
+ formatMimeSrc.containerType = SL_CONTAINERTYPE_RAW;
+ audioSource.pLocator = (void *) &locatorAbqSrc;
+ audioSource.pFormat = (void *) &formatMimeSrc;
+
+ // sink: PCM BufferQueue
+ PcmBqSinkInitialization();
+ // AudioPlayer creation
+ AudioPlayerCreation();
+ }
+
+ /* Test case for creating an AudioRecorder object */
+ void AudioRecorderCreation() {
+ // source: IO device
+ SLDataLocator_IODevice locatorIoDeviceSrc;
+ locatorIoDeviceSrc.locatorType = SL_DATALOCATOR_IODEVICE;
+ locatorIoDeviceSrc.deviceType = SL_IODEVICE_AUDIOINPUT;
+ locatorIoDeviceSrc.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT;
+ locatorIoDeviceSrc.device = NULL;
+ audioSource.pLocator = (void *) &locatorIoDeviceSrc;
+ audioSource.pFormat = NULL;
+
+ // sink: PCM BufferQueue
+ PcmBqSinkInitialization();
+
+ // AudioRecorder creation
+ SLObjectItf audioRecorderObj = NULL;
+ res = (*engineItf)->CreateAudioRecorder(engineItf, &audioRecorderObj,
+ &audioSource, &audioSink, 0, NULL/*iidArray*/, NULL/*required*/);
+ ASSERT_TRUE(IsOk(res));
+ ASSERT_TRUE(NULL != audioRecorderObj);
+ res = (*audioRecorderObj)->Realize(audioRecorderObj, SL_BOOLEAN_FALSE);
+ ASSERT_TRUE(IsOk(res));
+
+ // AudioRecorder destruction
+ (*audioRecorderObj)->Destroy(audioRecorderObj);
+ }
+};
+
+//-------------------------------------------------------------------------------------------------
+TEST_F(SLObjectCreationTest, testEngineCreation) {
+ ALOGV("Test Fixture: EngineCreation");
+ // nothing to do here that isn't done in SetUp()
+}
+
+TEST_F(SLObjectCreationTest, testOutputMixCreation) {
+ ALOGV("Test Fixture: OutputMixCreation");
+ OutputMixCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromUriCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromUriCreation");
+ // required for AudioPlayer creation
+ OutputMixCreation();
+ AudioPlayerFromUriCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromFdCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromFdCreation");
+ // required for AudioPlayer creation
+ OutputMixCreation();
+ AudioPlayerFromFdCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromPcmBqCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromPcmBqCreation");
+ // required for AudioPlayer creation
+ OutputMixCreation();
+ AudioPlayerFromPcmBqCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromTsAbqCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromTsAbqCreation");
+ // required for AudioPlayer creation
+ OutputMixCreation();
+ AudioPlayerFromTsAbqCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromUriToPcmBqCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromUriToPcmBqCreation");
+ AudioPlayerFromUriToPcmBqCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromFdToPcmBqCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromFdToPcmBqCreation");
+ AudioPlayerFromFdToPcmBqCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioPlayerFromAdtsAbqToPcmBqCreation) {
+ ALOGV("Test Fixture: AudioPlayerFromAdtsAbqToPcmBqCreation");
+ AudioPlayerFromAdtsAbqToPcmBqCreation();
+}
+
+TEST_F(SLObjectCreationTest, testAudioRecorderCreation) {
+ ALOGV("Test Fixture: AudioRecorderCreation");
+ AudioRecorderCreation();
+}
+
+int main(int argc, char **argv) {
+ testing::InitGoogleTest(&argc, argv);
+
+ return RUN_ALL_TESTS();
+}
diff --git a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp b/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
deleted file mode 100644
index e2f32c7..0000000
--- a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Test for testing the creation of OpenSL ES objects under various configurations (determined
- * by their data source and sink types) that are expected to be supported.
- * The tests verify the creation and completion of the call to Realize() for the following objects:
- * - Engine
- * - OutputMix
- * - AudioPlayer:
- * * source is URI
- * * source is FD
- * * source is BufferQueue of PCM buffers
- * * source is AndroidBufferQueue of MP2TS buffers
- * * source is URI, sink is BufferQueue of PCM buffers
- * * source is FD, sink is BufferQueue of PCM buffers
- * * source is AndroidBufferQueue of AAC ADTS buffers, sink is BufferQueue of PCM buffers
- * - AudioRecorder
- * * source is IO device, sink is BufferQueue of PCM buffers
- */
-
-#define LOG_NDEBUG 0
-#define LOG_TAG "SLObjectCreationTest"
-
-#include <utils/Log.h>
-#include "SLES/OpenSLES.h"
-#include "SLES/OpenSLES_Android.h"
-#include "OpenSLESUT.h"
-#include <gtest/gtest.h>
-
-//-----------------------------------------------------------------
-/* Checks for error and displays the error code if any */
-bool IsOk(SLresult res) {
- if (SL_RESULT_SUCCESS != res) {
- const char *str = slesutResultToString(res);
- if (NULL == str)
- str = "unknown";
- fprintf(stderr, "IsOk failure: %s (0x%x), exiting\n", str, res);
- return false;
- }
- return true;
-}
-
-//-----------------------------------------------------------------
-class SLObjectCreationTest : public ::testing::Test {
-
-protected:
- SLresult res;
- SLObjectItf engineObj, outputMixObj, audioPlayerObj;
- SLEngineItf engineItf;
-
- SLDataSource audioSource;
- SLDataSink audioSink;
- SLDataLocator_URI locatorUriSrc;
- SLDataLocator_AndroidBufferQueue locatorAbqSrc;
- SLDataLocator_AndroidFD locatorFdSrc;
- SLDataFormat_MIME formatMimeSrc;
-
- SLDataLocator_OutputMix locatorOutputmixSnk;
- SLDataLocator_AndroidSimpleBufferQueue locatorBqSnk;
- SLDataFormat_PCM formatPcmSnk;
-
- SLObjectCreationTest() { }
-
- virtual ~SLObjectCreationTest() { }
-
- /* Test setup*/
- virtual void SetUp() {
- LOGV("Test Setup()");
- res = SL_RESULT_UNKNOWN_ERROR;
- engineItf = NULL;
- engineObj = NULL;
- outputMixObj = NULL;
- audioPlayerObj = NULL;
- // Engine creation
- res = slCreateEngine(&engineObj, 0, NULL, 0, NULL, NULL);
- ASSERT_TRUE(IsOk(res));
- res = (*engineObj)->Realize(engineObj, SL_BOOLEAN_FALSE);
- ASSERT_TRUE(IsOk(res));
- res = (*engineObj)->GetInterface(engineObj, SL_IID_ENGINE, &engineItf);
- ASSERT_TRUE(IsOk(res));
- ASSERT_TRUE(NULL != engineItf);
- }
-
- virtual void TearDown() {
- LOGV("Test TearDown()");
- if (audioPlayerObj) {
- (*audioPlayerObj)->Destroy(audioPlayerObj);
- audioPlayerObj = NULL;
- }
- if (outputMixObj) {
- (*outputMixObj)->Destroy(outputMixObj);
- outputMixObj = NULL;
- }
- if (engineObj){
- (*engineObj)->Destroy(engineObj);
- engineObj = NULL;
- }
- }
-
- //---------------------------------------------------------------------------------------------
- // Test implementation convenience methods (to avoid code duplication)
-
- void AudioPlayerCreation() {
- res = (*engineItf)->CreateAudioPlayer(engineItf, &audioPlayerObj,
- &audioSource, &audioSink, 0, NULL/*iidArray*/, NULL/*required*/);
- ASSERT_TRUE(IsOk(res));
- ASSERT_TRUE(NULL != audioPlayerObj);
- res = (*audioPlayerObj)->Realize(audioPlayerObj, SL_BOOLEAN_FALSE);
- ASSERT_TRUE(IsOk(res));
- }
-
- void OutputMixSinkInitialization() {
- locatorOutputmixSnk.locatorType = SL_DATALOCATOR_OUTPUTMIX;
- locatorOutputmixSnk.outputMix = outputMixObj; // created in OutputMixCreation()
- audioSink.pLocator = &locatorOutputmixSnk;
- audioSink.pFormat = NULL;
- }
-
- void UriSourceInitialization() {
- locatorUriSrc.locatorType = SL_DATALOCATOR_URI;
- locatorUriSrc.URI = (SLchar*) "/dummyPath/dummyFile.mp3";
- formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
- formatMimeSrc.mimeType = (SLchar *) NULL;
- formatMimeSrc.containerType = SL_CONTAINERTYPE_UNSPECIFIED;
- audioSource.pLocator = &locatorUriSrc;
- audioSource.pFormat = &formatMimeSrc;
- }
-
- void FdSourceInitialization() {
- locatorFdSrc.locatorType = SL_DATALOCATOR_ANDROIDFD;
- locatorFdSrc.fd = (SLint32) 1;// a positive value to fake a valid FD
- locatorFdSrc.length = 10;
- locatorFdSrc.offset = 0;
- formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
- formatMimeSrc.mimeType = (SLchar *) NULL;
- formatMimeSrc.containerType = SL_CONTAINERTYPE_UNSPECIFIED;
- audioSource.pLocator = &locatorFdSrc;
- audioSource.pFormat = &formatMimeSrc;
- }
-
- void PcmBqSinkInitialization() {
- locatorBqSnk.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
- locatorBqSnk.numBuffers = 16;
- formatPcmSnk.formatType = SL_DATAFORMAT_PCM;
- formatPcmSnk.numChannels = 1;
- formatPcmSnk.samplesPerSec = SL_SAMPLINGRATE_8;
- formatPcmSnk.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16;
- formatPcmSnk.containerSize = 16;
- formatPcmSnk.channelMask = SL_SPEAKER_FRONT_LEFT;
- formatPcmSnk.endianness = SL_BYTEORDER_LITTLEENDIAN;
- audioSink.pLocator = (void *) &locatorBqSnk;
- audioSink.pFormat = (void *) &formatPcmSnk;
- }
-
- //---------------------------------------------------------------------------------------------
- // Tests
-
- /* Test case for creating an AudioPlayer object */
- void OutputMixCreation() {
- res = (*engineItf)->CreateOutputMix(engineItf, &outputMixObj,
- 0, NULL/*iidArray*/, NULL/*required*/);
- ASSERT_TRUE(IsOk(res));
- ASSERT_TRUE(NULL != outputMixObj);
- res = (*outputMixObj)->Realize(outputMixObj, SL_BOOLEAN_FALSE);
- ASSERT_TRUE(IsOk(res));
- }
-
- /* Test case for creating an AudioPlayer object that plays from a URI */
- void AudioPlayerFromUriCreation() {
- // source: URI
- UriSourceInitialization();
- // sink: OutputMix
- OutputMixSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioPlayer object that plays from a FD */
- void AudioPlayerFromFdCreation() {
- // source: FD
- FdSourceInitialization();
- // sink: OutputMix
- OutputMixSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioPlayer object that plays from a PCM BufferQueue */
- void AudioPlayerFromPcmBqCreation() {
- // source: PCM BufferQueue
- SLDataLocator_BufferQueue locatorBufferQueue;
- locatorBufferQueue.locatorType = SL_DATALOCATOR_BUFFERQUEUE;
- locatorBufferQueue.numBuffers = 16;
- SLDataFormat_PCM pcm;
- pcm.formatType = SL_DATAFORMAT_PCM;
- pcm.numChannels = 2;
- pcm.samplesPerSec = SL_SAMPLINGRATE_44_1;
- pcm.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16;
- pcm.containerSize = 16;
- pcm.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
- audioSource.pLocator = &locatorBufferQueue;
- audioSource.pFormat = &pcm;
-
- // sink: OutputMix
- OutputMixSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioPlayer object that plays from Transport Stream ABQ */
- void AudioPlayerFromTsAbqCreation() {
- // source: transport stream in an AndroidBufferQueue
- locatorAbqSrc.locatorType = SL_DATALOCATOR_ANDROIDBUFFERQUEUE;
- locatorAbqSrc.numBuffers = 16;
- formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
- formatMimeSrc.mimeType = (SLchar *) "video/mp2ts";
- formatMimeSrc.containerType = SL_CONTAINERTYPE_MPEG_TS;
- audioSource.pFormat = (void *)&formatMimeSrc;
- audioSource.pLocator = (void *)&locatorAbqSrc;
-
- // sink: OutputMix
- OutputMixSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioPlayer object that decodes from a URI to a PCM BQ */
- void AudioPlayerFromUriToPcmBqCreation() {
- // source: URI
- UriSourceInitialization();
- // sink: PCM BufferQueue
- PcmBqSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioPlayer object that decodes from a FD to a PCM BQ */
- void AudioPlayerFromFdToPcmBqCreation() {
- // source: FD
- FdSourceInitialization();
- // sink: PCM BufferQueue
- PcmBqSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioPlayer object that decodes from a ADTS ABQ to a PCM BQ */
- void AudioPlayerFromAdtsAbqToPcmBqCreation() {
- // source: ADTS AndroidBufferQueue
- locatorAbqSrc.locatorType = SL_DATALOCATOR_ANDROIDBUFFERQUEUE;
- locatorAbqSrc.numBuffers = 16;
- formatMimeSrc.formatType = SL_DATAFORMAT_MIME;
- formatMimeSrc.mimeType = (SLchar *)"audio/aac-adts";
- formatMimeSrc.containerType = SL_CONTAINERTYPE_RAW;
- audioSource.pLocator = (void *) &locatorAbqSrc;
- audioSource.pFormat = (void *) &formatMimeSrc;
-
- // sink: PCM BufferQueue
- PcmBqSinkInitialization();
- // AudioPlayer creation
- AudioPlayerCreation();
- }
-
- /* Test case for creating an AudioRecorder object */
- void AudioRecorderCreation() {
- // source: IO device
- SLDataLocator_IODevice locatorIoDeviceSrc;
- locatorIoDeviceSrc.locatorType = SL_DATALOCATOR_IODEVICE;
- locatorIoDeviceSrc.deviceType = SL_IODEVICE_AUDIOINPUT;
- locatorIoDeviceSrc.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT;
- locatorIoDeviceSrc.device = NULL;
- audioSource.pLocator = (void *) &locatorIoDeviceSrc;
- audioSource.pFormat = NULL;
-
- // sink: PCM BufferQueue
- PcmBqSinkInitialization();
-
- // AudioRecorder creation
- SLObjectItf audioRecorderObj = NULL;
- res = (*engineItf)->CreateAudioRecorder(engineItf, &audioRecorderObj,
- &audioSource, &audioSink, 0, NULL/*iidArray*/, NULL/*required*/);
- ASSERT_TRUE(IsOk(res));
- ASSERT_TRUE(NULL != audioRecorderObj);
- res = (*audioRecorderObj)->Realize(audioRecorderObj, SL_BOOLEAN_FALSE);
- ASSERT_TRUE(IsOk(res));
-
- // AudioRecorder destruction
- (*audioRecorderObj)->Destroy(audioRecorderObj);
- }
-};
-
-//-------------------------------------------------------------------------------------------------
-TEST_F(SLObjectCreationTest, testEngineCreation) {
- LOGV("Test Fixture: EngineCreation");
- // nothing to do here that isn't done in SetUp()
-}
-
-TEST_F(SLObjectCreationTest, testOutputMixCreation) {
- LOGV("Test Fixture: OutputMixCreation");
- OutputMixCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromUriCreation) {
- LOGV("Test Fixture: AudioPlayerFromUriCreation");
- // required for AudioPlayer creation
- OutputMixCreation();
- AudioPlayerFromUriCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromFdCreation) {
- LOGV("Test Fixture: AudioPlayerFromFdCreation");
- // required for AudioPlayer creation
- OutputMixCreation();
- AudioPlayerFromFdCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromPcmBqCreation");
- // required for AudioPlayer creation
- OutputMixCreation();
- AudioPlayerFromPcmBqCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromTsAbqCreation) {
- LOGV("Test Fixture: AudioPlayerFromTsAbqCreation");
- // required for AudioPlayer creation
- OutputMixCreation();
- AudioPlayerFromTsAbqCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromUriToPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromUriToPcmBqCreation");
- AudioPlayerFromUriToPcmBqCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromFdToPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromFdToPcmBqCreation");
- AudioPlayerFromFdToPcmBqCreation();
-}
-
-TEST_F(SLObjectCreationTest, testAudioPlayerFromAdtsAbqToPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromAdtsAbqToPcmBqCreation");
- AudioPlayerFromAdtsAbqToPcmBqCreation();
-}
-
-int main(int argc, char **argv) {
- testing::InitGoogleTest(&argc, argv);
-
- return RUN_ALL_TESTS();
-}
diff --git a/tests/tests/nativemedia/xa/Android.mk b/tests/tests/nativemedia/xa/Android.mk
new file mode 100644
index 0000000..da6e5eb
--- /dev/null
+++ b/tests/tests/nativemedia/xa/Android.mk
@@ -0,0 +1,32 @@
+# Build the unit tests.
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_C_INCLUDES:= \
+ bionic \
+ bionic/libstdc++/include \
+ external/gtest/include \
+ system/media/wilhelm/include \
+ external/stlport/stlport \
+ system/media/wilhelm/src/ut
+
+LOCAL_SRC_FILES:= \
+ src/XAObjectCreationTest.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libutils \
+ libOpenMAXAL \
+ libstlport
+
+LOCAL_STATIC_LIBRARIES := \
+ libgtest
+
+LOCAL_MODULE:= NativeMediaTest_XA
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
+
+LOCAL_CTS_TEST_PACKAGE := android.nativemedia.xa
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/tests/tests/nativemedia/xa/src/XAObjectCreationTest.cpp b/tests/tests/nativemedia/xa/src/XAObjectCreationTest.cpp
new file mode 100644
index 0000000..3ff84c2
--- /dev/null
+++ b/tests/tests/nativemedia/xa/src/XAObjectCreationTest.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Test for testing the creation of OpenMAX AL objects.
+ * The tests verify the creation and completion of the call to Realize() for the following objects:
+ * - Engine
+ * - OutputMix
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_TAG "XAObjectCreationTest"
+
+#include <utils/Log.h>
+#include "OMXAL/OpenMAXAL.h"
+#include "OMXAL/OpenMAXAL_Android.h"
+//#include <android/native_window_jni.h>
+#include <gtest/gtest.h>
+
+//-----------------------------------------------------------------
+/* Checks for error and displays the error code if any */
+bool IsOk(XAresult res) {
+ if (XA_RESULT_SUCCESS != res) {
+ fprintf(stderr, "IsOk failure: 0x%x, exiting\n", res);
+ return false;
+ }
+ return true;
+}
+
+//-----------------------------------------------------------------
+class XAObjectCreationTest : public ::testing::Test {
+
+protected:
+ XAresult res;
+ XAObjectItf engineObj, outputMixObj, mediaPlayerObj;
+ XAEngineItf engineItf;
+
+ XADataSource mediaSource;
+ XADataSink audioSink;
+ XADataLocator_URI locatorUriSrc;
+ XADataLocator_AndroidBufferQueue locatorAbqSrc;
+ XADataLocator_AndroidFD locatorFdSrc;
+ XADataFormat_MIME formatMimeSrc;
+
+ XADataLocator_OutputMix locatorOutputmixSink;
+ XADataFormat_PCM formatPcmSink;
+
+ XADataLocator_NativeDisplay locatorVideoSink;
+ XADataSink imageSink;
+
+ //ANativeWindow* pNativeWindow;
+
+ XAObjectCreationTest() { }
+
+ virtual ~XAObjectCreationTest() { }
+
+ /* Test setup*/
+ virtual void SetUp() {
+ ALOGV("Test Setup()");
+ res = XA_RESULT_UNKNOWN_ERROR;
+ engineItf = NULL;
+ engineObj = NULL;
+ outputMixObj = NULL;
+ mediaPlayerObj = NULL;
+ // Engine creation
+ res = xaCreateEngine(&engineObj, 0, NULL, 0, NULL, NULL);
+ ASSERT_TRUE(IsOk(res));
+ res = (*engineObj)->Realize(engineObj, XA_BOOLEAN_FALSE);
+ ASSERT_TRUE(IsOk(res));
+ res = (*engineObj)->GetInterface(engineObj, XA_IID_ENGINE, &engineItf);
+ ASSERT_TRUE(IsOk(res));
+ ASSERT_TRUE(NULL != engineItf);
+ }
+
+ virtual void TearDown() {
+ ALOGV("Test TearDown()");
+ if (mediaPlayerObj) {
+ (*mediaPlayerObj)->Destroy(mediaPlayerObj);
+ mediaPlayerObj = NULL;
+ }
+ if (outputMixObj) {
+ (*outputMixObj)->Destroy(outputMixObj);
+ outputMixObj = NULL;
+ }
+ if (engineObj){
+ (*engineObj)->Destroy(engineObj);
+ engineObj = NULL;
+ }
+ }
+
+ //---------------------------------------------------------------------------------------------
+ // Tests
+
+ /* Test case for creating an MediaPlayer object */
+ void OutputMixCreation() {
+ res = (*engineItf)->CreateOutputMix(engineItf, &outputMixObj,
+ 0, NULL/*iidArray*/, NULL/*required*/);
+ ASSERT_TRUE(IsOk(res));
+ ASSERT_TRUE(NULL != outputMixObj);
+ res = (*outputMixObj)->Realize(outputMixObj, XA_BOOLEAN_FALSE);
+ ASSERT_TRUE(IsOk(res));
+ }
+
+};
+
+//-------------------------------------------------------------------------------------------------
+TEST_F(XAObjectCreationTest, testEngineCreation) {
+ ALOGV("Test Fixture: EngineCreation");
+ // nothing to do here that isn't done in SetUp()
+}
+
+TEST_F(XAObjectCreationTest, testOutputMixCreation) {
+ ALOGV("Test Fixture: OutputMixCreation");
+ OutputMixCreation();
+}
+
+int main(int argc, char **argv) {
+ testing::InitGoogleTest(&argc, argv);
+
+ return RUN_ALL_TESTS();
+}
+
diff --git a/tests/tests/ndef/Android.mk b/tests/tests/ndef/Android.mk
index 4cb0b78..13e5624 100644
--- a/tests/tests/ndef/Android.mk
+++ b/tests/tests/ndef/Android.mk
@@ -31,4 +31,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/ndef/src/android/ndef/cts/BasicNdefTest.java b/tests/tests/ndef/src/android/ndef/cts/BasicNdefTest.java
deleted file mode 100644
index 6e2ac3c..0000000
--- a/tests/tests/ndef/src/android/ndef/cts/BasicNdefTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.ndef.cts;
-
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.FormatException;
-
-import junit.framework.TestCase;
-
-public class BasicNdefTest extends TestCase {
- /**
- * A Smart Poster containing a URL and no text.
- */
- public static final byte[] SMART_POSTER_URL_NO_TEXT = new byte[] {
- (byte) 0xd1, (byte) 0x02, (byte) 0x0f, (byte) 0x53, (byte) 0x70, (byte) 0xd1,
- (byte) 0x01, (byte) 0x0b, (byte) 0x55, (byte) 0x01, (byte) 0x67, (byte) 0x6f,
- (byte) 0x6f, (byte) 0x67, (byte) 0x6c, (byte) 0x65, (byte) 0x2e, (byte) 0x63,
- (byte) 0x6f, (byte) 0x6d
- };
-
- public void test_parseSmartPoster() throws FormatException {
- NdefMessage msg = new NdefMessage(SMART_POSTER_URL_NO_TEXT);
- NdefRecord[] records = msg.getRecords();
-
- assertEquals(1, records.length);
-
- assertEquals(0, records[0].getId().length);
-
- assertEquals(NdefRecord.TNF_WELL_KNOWN, records[0].getTnf());
-
- assertByteArrayEquals(NdefRecord.RTD_SMART_POSTER, records[0].getType());
-
- assertByteArrayEquals(new byte[] {
- (byte) 0xd1, (byte) 0x01, (byte) 0x0b, (byte) 0x55, (byte) 0x01,
- (byte) 0x67, (byte) 0x6f, (byte) 0x6f, (byte) 0x67, (byte) 0x6c,
- (byte) 0x65, (byte) 0x2e, (byte) 0x63, (byte) 0x6f, (byte) 0x6d},
- records[0].getPayload());
- }
-
- private static void assertByteArrayEquals(byte[] b1, byte[] b2) {
- assertEquals(b1.length, b2.length);
- for (int i = 0; i < b1.length; i++) {
- assertEquals(b1[i], b2[i]);
- }
- }
-}
diff --git a/tests/tests/ndef/src/android/ndef/cts/NdefTest.java b/tests/tests/ndef/src/android/ndef/cts/NdefTest.java
new file mode 100644
index 0000000..3a36325
--- /dev/null
+++ b/tests/tests/ndef/src/android/ndef/cts/NdefTest.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.ndef.cts;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+import android.net.Uri;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.FormatException;
+
+import junit.framework.TestCase;
+
+/**
+ * NDEF is a NFC-Forum defined data format.<p>
+ * NDEF is often used with NFC, but it is just a data format and no NFC
+ * hardware is required, so these API's are mandatory even on Android
+ * devices without NFC hardware.
+ */
+public class NdefTest extends TestCase {
+ static final Charset ASCII = Charset.forName("US-ASCII");
+ static final Charset UTF8 = Charset.forName("UTF-8");
+
+ public void testConstructor() {
+ NdefRecord r;
+
+ r = new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null);
+ assertEquals(new byte[0], r.getId());
+ assertEquals(new byte[0], r.getType());
+ assertEquals(new byte[0], r.getPayload());
+ assertEquals(NdefRecord.TNF_EMPTY, r.getTnf());
+ }
+
+ public void testEquals() {
+ assertEquals(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null));
+ assertEquals(
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9}),
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9}));
+ assertNotEquals(
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9}),
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9,10}));
+ assertEquals(
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9})),
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9})));
+ assertNotEquals(
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9})),
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9,10})));
+ assertNotEquals(
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9})),
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9}),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)));
+
+ // test hashCode
+ assertEquals(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null).hashCode(),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null).hashCode());
+ assertEquals(
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9})).hashCode(),
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE,
+ new byte[] {1,2,3}, new byte[] {4,5,6}, new byte[] {7,8,9})).hashCode());
+ }
+
+ public void testInvalidParsing() throws FormatException {
+ final byte[][] invalidNdefMessages = {
+ {}, // too short
+ {(byte)0xD0}, // too short
+ {(byte)0xD0, 0}, // too short
+ {(byte)0xD0, 0, 0, 0, 0}, // too long
+ {(byte)0x50, 0, 0}, // missing MB
+ {(byte)0x90, 0, 0}, // missing ME
+ {(byte)0xC0, 0, 0, 0}, // long record, too short
+ {(byte)0xC0, 0, 0, 0, 0}, // long record, too short
+ {(byte)0xC0, 0, 0, 0, 0, 0, 0}, // long record, too long
+ {(byte)0xD8, 1, 3, 1, 0, 0, 0, 0}, // SR w/ payload&type&id, too short
+ {(byte)0xD8, 1, 3, 1, 0, 0, 0, 0, 0, 0}, // SR w/ payload&type&id, too long
+ {(byte)0xD8, 0, 0, 1, 0}, // TNF_EMPTY cannot have id field
+ {(byte)0x90, 0, 0, (byte)0x10, 0, 0}, // 2 records, missing ME
+ {(byte)0xF5, 0, 0}, // CF and ME set
+ {(byte)0xD6, 0, 0}, // TNF_UNCHANGED without chunking
+ {(byte)0xB6, 0, 1, 1, (byte)0x56, 0, 1, 2}, // TNF_UNCHANGED in first chunk
+ {(byte)0xC5, 0, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF}, // heap-smash check
+ };
+
+ for (byte[] b : invalidNdefMessages) {
+ try {
+ new NdefMessage(b);
+ fail("expected FormatException for input " + bytesToString(b));
+ } catch (FormatException e) { }
+ }
+ }
+
+ public void testValidParsing() throws FormatException {
+ // short record
+ assertEquals(new NdefMessage(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)),
+ new NdefMessage(new byte[] {(byte)0xD0, 0, 0}));
+
+ // full length record
+ assertEquals(new NdefMessage(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)),
+ new NdefMessage(new byte[] {(byte)0xC0, 0, 0, 0, 0, 0}));
+
+ // SR with ID flag and 0-length id
+ assertEquals(new NdefMessage(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)),
+ new NdefMessage(new byte[] {(byte)0xD8, 0, 0, 0}));
+
+ // SR with ID flag and 1-length id
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_WELL_KNOWN, null, new byte[] {0}, null)),
+ new NdefMessage(new byte[] {(byte)0xD9, 0, 0, 1, 0}));
+
+ // ID flag and 1-length id
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_WELL_KNOWN, null, new byte[] {0}, null)),
+ new NdefMessage(new byte[] {(byte)0xC9, 0, 0, 0, 0, 0, 1, 0}));
+
+ // SR with payload
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_WELL_KNOWN, null, null, new byte[] {1, 2, 3})),
+ new NdefMessage(new byte[] {(byte)0xD1, 0, 3, 1, 2, 3}));
+
+ // SR with payload and type
+ assertEquals(new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_WELL_KNOWN, new byte[] {9}, null, new byte[] {1, 2, 3})),
+ new NdefMessage(new byte[] {(byte)0xD1, 1, 3, 9, 1, 2, 3}));
+
+ // SR with payload, type and id
+ assertEquals(new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_WELL_KNOWN, new byte[] {8}, new byte[] {9}, new byte[] {1, 2, 3})),
+ new NdefMessage(new byte[] {(byte)0xD9, 1, 3, 1, 8, 9, 1, 2, 3}));
+
+ // payload, type and id
+ assertEquals(new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_WELL_KNOWN, new byte[] {8}, new byte[] {9}, new byte[] {1, 2, 3})),
+ new NdefMessage(new byte[] {(byte)0xC9, 1, 0, 0, 0, 3, 1, 8, 9, 1, 2, 3}));
+
+ // 2 records
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)),
+ new NdefMessage(new byte[] {(byte)0x90, 0, 0, (byte)0x50, 0, 0}));
+
+ // 3 records
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)),
+ new NdefMessage(new byte[] {(byte)0x90, 0, 0, (byte)0x10, 0, 0, (byte)0x50, 0, 0}));
+
+ // chunked record (2 chunks)
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_UNKNOWN, null, null, new byte[] {1, 2})),
+ new NdefMessage(new byte[] {(byte)0xB5, 0, 1, 1, (byte)0x56, 0, 1, 2}));
+
+ // chunked record (3 chunks)
+ assertEquals(new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_UNKNOWN, null, null, new byte[] {1, 2})),
+ new NdefMessage(
+ new byte[] {(byte)0xB5, 0, 0, (byte)0x36, 0, 1, 1, (byte)0x56, 0, 1, 2}));
+
+ // chunked with id and type
+ assertEquals(new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_MIME_MEDIA, new byte[] {8}, new byte[] {9}, new byte[] {1, 2})),
+ new NdefMessage(new byte[] {(byte)0xBA, 1, 0, 1, 8, 9, (byte)0x36, 0, 1, 1,
+ (byte)0x56, 0, 1, 2}));
+
+ // 3 records, 7 chunks
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE, null, null, new byte[] {1,2,3,4}),
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(NdefRecord.TNF_MIME_MEDIA, null, null, new byte[] {11,12,13,14})),
+ new NdefMessage(new byte[] {
+ (byte)0xB4, 0, 1, 1, (byte)0x36, 0, 2, 2, 3, (byte)0x16, 0, 1, 4,
+ (byte)0x10, 0, 0,
+ (byte)0x32, 0, 2, 11, 12, (byte)0x36, 0, 1, 13, (byte)0x56, 0, 1, 14
+ }));
+
+ // 255 byte payload
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_UNKNOWN, null, null, new byte[] {
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7})),
+ new NdefMessage(new byte[] {(byte)0xC5, 0, 0, 0, 0, (byte)0xFF,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7}));
+
+ // 256 byte payload
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_UNKNOWN, null, null, new byte[] {
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,})),
+ new NdefMessage(new byte[] {(byte)0xC5, 0, 0, 0, 1, 0,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,}));
+
+ // 255 byte type
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_MIME_MEDIA, new byte[] {
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7},
+ null, null)),
+ new NdefMessage(new byte[] {(byte)0xD2, (byte)0xFF, 0,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,}));
+
+ // 255 byte id
+ assertEquals(new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_MIME_MEDIA, null, new byte[] {
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7},
+ null)),
+ new NdefMessage(new byte[] {(byte)0xDA, 0, 0, (byte)0xFF,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,}));
+ // NdefRecord parsing ignores incorrect MB
+ assertEquals(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(new byte[] {(byte)0x50, 0, 0}));
+
+ // NdefRecord parsing ignores incorrect ME
+ assertEquals(new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null),
+ new NdefRecord(new byte[] {(byte)0x90, 0, 0}));
+
+ // NdefRecord parsing can handle chunking with incorrect MB, ME
+ assertEquals(new NdefRecord(NdefRecord.TNF_UNKNOWN, null, null, new byte[] {1, 2}),
+ new NdefRecord(new byte[] {(byte)0x35, 0, 1, 1, (byte)0x16, 0, 1, 2}));
+
+ //A Smart Poster containing a URL and no text (nested NDEF Messages) */
+ assertEquals(new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_WELL_KNOWN, NdefRecord.RTD_SMART_POSTER, null,
+ new NdefMessage(NdefRecord.createUri("http://www.google.com")).toByteArray())),
+ new NdefMessage(new byte[] {
+ (byte) 0xd1, (byte) 0x02, (byte) 0x0f, (byte) 0x53, (byte) 0x70, (byte) 0xd1,
+ (byte) 0x01, (byte) 0x0b, (byte) 0x55, (byte) 0x01, (byte) 0x67, (byte) 0x6f,
+ (byte) 0x6f, (byte) 0x67, (byte) 0x6c, (byte) 0x65, (byte) 0x2e, (byte) 0x63,
+ (byte) 0x6f, (byte) 0x6d}));
+ }
+
+ public void testCreateUri() {
+ assertEquals(new byte[] {
+ (byte)0xD1, 1, 8, 'U', (byte)0x01, 'n', 'f', 'c', '.', 'c', 'o', 'm'},
+ new NdefMessage(
+ NdefRecord.createUri(Uri.parse("http://www.nfc.com"))).toByteArray());
+
+ assertEquals(new byte[] {(byte)0xD1, 1, 13, 'U', (byte)0x05,
+ '+', '3', '5', '8', '9', '1', '2', '3', '4', '5', '6', '7'},
+ new NdefMessage(NdefRecord.createUri("tel:+35891234567")).toByteArray());
+
+ assertEquals(new byte[] {
+ (byte)0xD1, 1, 4, 'U', (byte)0x00, 'f', 'o', 'o'},
+ new NdefMessage(NdefRecord.createUri("foo")).toByteArray());
+
+ // make sure UTF-8 encoding is used
+ assertEquals(new byte[] {
+ (byte)0xD1, 1, 3, 'U', (byte)0x00, (byte)0xC2, (byte)0xA2},
+ new NdefMessage(NdefRecord.createUri("\u00A2")).toByteArray());
+ }
+
+ public void testCreateMime() {
+ assertEquals(
+ new NdefRecord(NdefRecord.TNF_MIME_MEDIA, "text/plain".getBytes(ASCII), null,
+ "foo".getBytes()),
+ NdefRecord.createMime("text/plain", "foo".getBytes()));
+ }
+
+ public void testCreateExternal() {
+ // invalid character
+ try {
+ NdefRecord.createExternal("a.b\n", "c", null);
+ fail("IllegalArgumentException not throw");
+ } catch (IllegalArgumentException e) { }
+
+ // invalid character
+ try {
+ NdefRecord.createExternal("a.b", "c\t", null);
+ fail("IllegalArgumentException not throw");
+ } catch (IllegalArgumentException e) { }
+
+ // invalid character
+ try {
+ NdefRecord.createExternal("a!b", "c", null);
+ fail("IllegalArgumentException not throw");
+ } catch (IllegalArgumentException e) { }
+
+ // valid
+ assertEquals(
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE, "a.b:c".getBytes(ASCII), null, null),
+ NdefRecord.createExternal("a.b", "c", null));
+
+ // test force lowercase
+ assertEquals(
+ new NdefRecord(NdefRecord.TNF_EXTERNAL_TYPE, "a.b:c!".getBytes(ASCII), null, null),
+ NdefRecord.createExternal("A.b", "C!", null));
+ }
+
+ public void testCreateApplicationRecord() throws FormatException {
+ NdefMessage m;
+ NdefRecord r;
+
+ // some failure cases
+ try {
+ NdefRecord.createApplicationRecord(null);
+ fail("NullPointerException not thrown");
+ } catch (NullPointerException e) {}
+ try {
+ NdefRecord.createApplicationRecord("");
+ fail("IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+
+ // create an AAR
+ r = NdefRecord.createApplicationRecord("com.foo.bar");
+ assertEquals(new byte[] {
+ (byte)0xd4, (byte)0x0f, (byte)0x0b, (byte)0x61,
+ (byte)0x6e, (byte)0x64, (byte)0x72, (byte)0x6f,
+ (byte)0x69, (byte)0x64, (byte)0x2e, (byte)0x63,
+ (byte)0x6f, (byte)0x6d, (byte)0x3a, (byte)0x70,
+ (byte)0x6b, (byte)0x67, (byte)0x63, (byte)0x6f,
+ (byte)0x6d, (byte)0x2e, (byte)0x66, (byte)0x6f,
+ (byte)0x6f, (byte)0x2e, (byte)0x62, (byte)0x61,
+ (byte)0x72,},
+ r.toByteArray());
+
+ // parse an AAR
+ m = new NdefMessage(new byte[] {
+ (byte)0xd4, (byte)0x0f, (byte)0x0b, (byte)0x61,
+ (byte)0x6e, (byte)0x64, (byte)0x72, (byte)0x6f,
+ (byte)0x69, (byte)0x64, (byte)0x2e, (byte)0x63,
+ (byte)0x6f, (byte)0x6d, (byte)0x3a, (byte)0x70,
+ (byte)0x6b, (byte)0x67, (byte)0x63, (byte)0x6f,
+ (byte)0x6d, (byte)0x2e, (byte)0x66, (byte)0x6f,
+ (byte)0x6f, (byte)0x2e, (byte)0x62, (byte)0x61,
+ (byte)0x72});
+ NdefRecord[] rs = m.getRecords();
+ assertEquals(1, rs.length);
+ r = rs[0];
+ assertEquals(NdefRecord.TNF_EXTERNAL_TYPE, r.getTnf());
+ assertEquals("android.com:pkg".getBytes(), r.getType());
+ assertEquals(new byte[] {}, r.getId());
+ assertEquals("com.foo.bar".getBytes(), r.getPayload());
+ }
+
+ public void testToByteArray() throws FormatException {
+ NdefRecord r;
+
+ // single short record
+ assertEquals(new byte[] {(byte)0xD0, 0, 0},
+ new NdefMessage(
+ new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null)).toByteArray());
+
+ // with id
+ assertEquals(new byte[] {(byte)0xDD, 0, 0, 1, 9},
+ new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_UNKNOWN, null, new byte[] {9}, null)).toByteArray());
+
+ // with type
+ assertEquals(new byte[] {(byte)0xD4, 1, 0, 9},
+ new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_EXTERNAL_TYPE, new byte[] {9}, null, null)).toByteArray());
+
+ // with payload
+ assertEquals(new byte[] {(byte)0xD5, 0, 1, 9},
+ new NdefMessage(new NdefRecord(
+ NdefRecord.TNF_UNKNOWN, null, null, new byte[] {9})).toByteArray());
+
+ // 3 records
+ r = new NdefRecord(NdefRecord.TNF_EMPTY, null, null, null);
+ assertEquals(new byte[] {(byte)0x90, 0, 0, (byte)0x10, 0, 0, (byte)0x50, 0, 0},
+ new NdefMessage(r, r, r).toByteArray());
+
+ // 256 byte payload
+ assertEquals(new byte[] {(byte)0xC5, 0, 0, 0, 1, 0,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,},
+ new NdefMessage(new NdefRecord(NdefRecord.TNF_UNKNOWN, null, null, new byte[] {
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,
+ 1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,1,2,3,4,5,6,7,8,})).toByteArray());
+ }
+
+ static void assertEquals(byte[] expected, byte[] actual) {
+ assertTrue("expected equals:<" + bytesToString(expected) + "> was:<" +
+ bytesToString(actual) + ">", Arrays.equals(expected, actual));
+ }
+
+ static void assertNotEquals(Object expected, Object actual) {
+ assertFalse("expected not equals:<" + expected + "> was:<" + actual + ">",
+ expected.equals(actual));
+ }
+
+ static String bytesToString(byte[] bs) {
+ StringBuilder s = new StringBuilder();
+ for (byte b : bs) {
+ s.append(String.format("%02X ", b));
+ }
+ return s.toString();
+ }
+}
\ No newline at end of file
diff --git a/tests/tests/net/Android.mk b/tests/tests/net/Android.mk
index 1fd9ba0..1f1e387 100644
--- a/tests/tests/net/Android.mk
+++ b/tests/tests/net/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/net/src/android/net/cts/ListeningPortsTest.java b/tests/tests/net/src/android/net/cts/ListeningPortsTest.java
deleted file mode 100644
index bcec0fe..0000000
--- a/tests/tests/net/src/android/net/cts/ListeningPortsTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-import java.util.regex.Pattern;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-public class ListeningPortsTest extends TestCase {
-
- /** Address patterns used to check whether we're checking the right column in /proc/net. */
- private static final List<String> ADDRESS_PATTERNS = new ArrayList<String>(2);
-
- static {
- ADDRESS_PATTERNS.add("[0-9A-F]{8}:[0-9A-F]{4}");
- ADDRESS_PATTERNS.add("[0-9A-F]{32}:[0-9A-F]{4}");
- }
-
- /** Ports that are allowed to be listening on the emulator. */
- private static final List<String> EXCEPTION_PATTERNS = new ArrayList<String>(6);
-
- static {
- // IPv4 exceptions
- EXCEPTION_PATTERNS.add("00000000:15B3"); // 0.0.0.0:5555 - emulator port
- EXCEPTION_PATTERNS.add("0F02000A:15B3"); // 10.0.2.15:5555 - net forwarding for emulator
- EXCEPTION_PATTERNS.add("[0-9A-F]{6}7F:[0-9A-F]{4}"); // IPv4 Loopback
-
- // IPv6 exceptions
- EXCEPTION_PATTERNS.add("[0]{25}1[0]{6}:[0-9A-F]{4}"); // IPv6 Loopback
- EXCEPTION_PATTERNS.add("[0]{16}[0]{4}[0]{4}[0-9A-F]{6}7F:[0-9A-F]{4}"); // IPv4-6 Conversion
- EXCEPTION_PATTERNS.add("[0]{16}[F]{4}[0]{4}[0-9A-F]{6}7F:[0-9A-F]{4}"); // IPv4-6 Conversion
- }
-
- public void testNoListeningTcpPorts() {
- assertNoListeningPorts("/proc/net/tcp", true);
- }
-
- public void testNoListeningTcp6Ports() {
- assertNoListeningPorts("/proc/net/tcp6", true);
- }
-
- public void testNoListeningUdpPorts() throws Exception {
- assertNoListeningUdpPorts("/proc/net/udp");
- }
-
- public void testNoListeningUdp6Ports() throws Exception {
- assertNoListeningUdpPorts("/proc/net/udp6");
- }
-
- private static final int RETRIES_MAX = 6;
-
- /**
- * UDP tests can be flaky due to DNS lookups. Compensate.
- */
- private static void assertNoListeningUdpPorts(String procFilePath) throws Exception {
- for (int i = 0; i < RETRIES_MAX; i++) {
- try {
- assertNoListeningPorts(procFilePath, false);
- return;
- } catch (ListeningPortsAssertionError e) {
- if (i == RETRIES_MAX - 1) {
- throw e;
- }
- Thread.sleep(2 * 1000 * i);
- }
- }
- throw new IllegalStateException("unreachable");
- }
-
- private static void assertNoListeningPorts(String procFilePath, boolean isTcp) {
-
- /*
- * Sample output of "cat /proc/net/tcp" on emulator:
- *
- * sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid ...
- * 0: 0100007F:13AD 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 ...
- * 1: 00000000:15B3 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 ...
- * 2: 0F02000A:15B3 0202000A:CE8A 01 00000000:00000000 00:00000000 00000000 0 ...
- *
- */
-
- File procFile = new File(procFilePath);
- Scanner scanner = null;
- try {
- scanner = new Scanner(procFile);
- while (scanner.hasNextLine()) {
- String line = scanner.nextLine().trim();
-
- // Skip column headers
- if (line.startsWith("sl")) {
- continue;
- }
-
- String[] fields = line.split("\\s+");
- final int expectedNumColumns = 12;
- assertTrue(procFilePath + " should have at least " + expectedNumColumns
- + " columns of output " + fields, fields.length >= expectedNumColumns);
-
- String localAddress = fields[1];
- String state = fields[3];
- String uid = fields[7];
-
- assertTrue(procFilePath + " should have an IP address in the second column",
- isAddress(localAddress));
-
- String localIp = localAddress.split(":")[0];
- int localPort = Integer.parseInt(localAddress.split(":")[1], 16);
-
- if (!isException(localAddress) && isPortListening(state, isTcp)) {
- throw new ListeningPortsAssertionError(
- "Found port listening on addr=" + localIp + ", port="
- + localPort + ", UID=" + uid + " in " + procFilePath);
- }
- }
- } catch (FileNotFoundException notFound) {
- fail("Could not open file " + procFilePath + " to check for listening ports.");
- } finally {
- if (scanner != null) {
- scanner.close();
- }
- }
- }
-
- private static boolean isAddress(String localAddress) {
- return isPatternMatch(ADDRESS_PATTERNS, localAddress);
- }
-
- private static boolean isException(String localAddress) {
- return isPatternMatch(EXCEPTION_PATTERNS, localAddress);
- }
-
- private static boolean isPatternMatch(List<String> patterns, String input) {
- for (String pattern : patterns) {
- if (Pattern.matches(pattern, input)) {
- return true;
- }
- }
- return false;
- }
-
- private static boolean isPortListening(String state, boolean isTcp) {
- // 0A = TCP_LISTEN from include/net/tcp_states.h
- String listeningState = isTcp ? "0A" : "07";
- return listeningState.equals(state);
- }
-
- private static class ListeningPortsAssertionError extends AssertionFailedError {
- private ListeningPortsAssertionError(String msg) {
- super(msg);
- }
- }
-}
diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index 57e6ec3..c07969e 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -31,4 +31,6 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
+
+#include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index 35cafb9..54ebc4a 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -32,4 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
index 94300b6..f5eca5e 100644
--- a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
+++ b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
@@ -21,9 +21,9 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.cts.util.PollingCheck;
import android.os.AsyncTask;
import android.test.InstrumentationTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.util.concurrent.TimeUnit;
@@ -108,7 +108,7 @@
}
// wait for the task to finish completely (including onPostResult()).
- new DelayedCheck(DURATION) {
+ new PollingCheck(DURATION) {
protected boolean check() {
return mAsyncTask.getStatus() == AsyncTask.Status.FINISHED;
}
@@ -132,7 +132,7 @@
}
// wait for progress update to be processed (happens asynchronously)
- new DelayedCheck(DURATION) {
+ new PollingCheck(DURATION) {
protected boolean check() {
return mAsyncTask.updateValue != null;
}
diff --git a/tests/tests/os/src/android/os/cts/DebugTest.java b/tests/tests/os/src/android/os/cts/DebugTest.java
index d4066fb..c05c78a 100644
--- a/tests/tests/os/src/android/os/cts/DebugTest.java
+++ b/tests/tests/os/src/android/os/cts/DebugTest.java
@@ -18,20 +18,16 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import android.content.Context;
import android.os.Debug;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
import dalvik.system.VMDebug;
-@TestTargetClass(Debug.class)
public class DebugTest extends AndroidTestCase {
- private boolean mHasNofify;
+ private static final Logger Log = Logger.getLogger(DebugTest.class.getName());
@Override
public void tearDown() throws Exception {
@@ -40,85 +36,12 @@
Debug.resetAllCounts();
}
-
- @TestTargetNew(
- level = TestLevel.NOT_NECESSARY,
- method = "changeDebugPort",
- args = {int.class}
- )
- public void testChangeDebugPort() {
- }
-
- @TestTargetNew(
- level = TestLevel.NOT_FEASIBLE,
- method = "enableEmulatorTraceOutput",
- args = {}
- )
- public void testEnableEmulatorTraceOutput() {
- }
-
- @TestTargetNew(
- level = TestLevel.NOT_FEASIBLE,
- method = "isDebuggerConnected",
- args = {}
- )
- public void testIsDebuggerConnected() {
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "printLoadedClasses",
- args = {int.class}
- )
public void testPrintLoadedClasses() {
Debug.printLoadedClasses(Debug.SHOW_FULL_DETAIL);
Debug.printLoadedClasses(Debug.SHOW_CLASSLOADER);
Debug.printLoadedClasses(Debug.SHOW_INITIALIZED);
}
- @TestTargetNew(
- level = TestLevel.NOT_FEASIBLE,
- method = "setAllocationLimit",
- args = {int.class}
- )
- public void testSetAllocationLimit() {
- }
-
- @TestTargetNew(
- level = TestLevel.NOT_FEASIBLE,
- method = "setGlobalAllocationLimit",
- args = {int.class}
- )
- public void testSetGlobalAllocationLimit() {
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "startMethodTracing",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "startMethodTracing",
- args = {java.lang.String.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "startMethodTracing",
- args = {java.lang.String.class, int.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "startMethodTracing",
- args = {java.lang.String.class, int.class, int.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "stopMethodTracing",
- args = {}
- )
- })
public void testStartMethodTracing() throws InterruptedException {
final long debugTime = 3000;
final String traceName = getFileName();
@@ -148,296 +71,45 @@
File file = new File(dir, "debug.trace");
return file.getAbsolutePath();
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "startNativeTracing",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "stopNativeTracing",
- args = {}
- )
- })
+
public void testStartNativeTracing() {
Debug.startNativeTracing();
Debug.stopNativeTracing();
}
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "threadCpuTimeNanos",
- args = {}
- )
- public void testThreadCpuTimeNanos() throws InterruptedException {
- final int TIME = 1000;
- if (Debug.threadCpuTimeNanos() != -1) {
- long currentCupTimeNanos = Debug.threadCpuTimeNanos();
- mHasNofify = false;
- final Object lock = new Object();
- TestThread t = new TestThread(new Runnable() {
+ public void testThreadCpuTimeNanos() throws Exception {
+ if (Debug.threadCpuTimeNanos() == -1) {
+ // Indicates the system does not support this operation, so we can't test it.
+ Log.log(Level.WARNING, "Skipping testThreadCpuTimeNanos() on unsupported system");
+ return;
+ }
+
+ TestThread t = new TestThread(new Runnable() {
+ @Override
public void run() {
- long time = System.currentTimeMillis();
- while (true) {
- if (System.currentTimeMillis() - time > TIME) {
- break;
- }
+ long startDebugTime = Debug.threadCpuTimeNanos();
+
+ // Do some work for a second to increment CPU time
+ long startSystemTime = System.currentTimeMillis();
+ while (System.currentTimeMillis() - startSystemTime < 1000) {
Math.random();
- if (System.currentTimeMillis() - time > TIME / 2 && !mHasNofify) {
- synchronized (lock) {
- mHasNofify = true;
- lock.notify();
- }
- break;
- }
}
+
+ // Verify that threadCpuTimeNanos reports that some work was done.
+ // We can't do more than this because the specification for this API call makes
+ // clear that this is only an estimate.
+ assertTrue(Debug.threadCpuTimeNanos() > startDebugTime);
}
});
- t.start();
- synchronized (lock) {
- if (!mHasNofify) {
- lock.wait();
- }
- }
- assertTrue(Debug.threadCpuTimeNanos() > currentCupTimeNanos);
- Thread.sleep(TIME / 2);
- }
+ t.start();
+ t.join();
}
- @TestTargetNew(
- level = TestLevel.NOT_FEASIBLE,
- method = "waitForDebugger",
- args = {}
- )
- @ToBeFixed(bug = "1419964", explanation = "This API leads to enter into a infinite cycle " +
- "which is always waiting a debugger. However the debugger waiting could not be cancled.")
- public void testWaitForDebugger() {
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "waitingForDebugger",
- args = {}
- )
public void testWaitingForDebugger() {
assertFalse(Debug.waitingForDebugger());
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "startAllocCounting",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "stopAllocCounting",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getMemoryInfo",
- args = {android.os.Debug.MemoryInfo.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalExternalAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalExternalAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalExternalFreedCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalExternalFreedSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalFreedCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalFreedSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getGlobalGcInvocationCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getThreadAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getThreadAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getThreadExternalAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getThreadExternalAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getThreadGcInvocationCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getLoadedClassCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getNativeHeapAllocatedSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getNativeHeapFreeSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getNativeHeapSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getBinderDeathObjectCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getBinderLocalObjectCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getBinderProxyObjectCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getBinderReceivedTransactions",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getBinderSentTransactions",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- notes = "test method: resetAllCounts",
- method = "resetAllCounts",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalFreedCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalFreedSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalGcInvocationCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalExternalAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalExternalAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalExternalFreedCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetGlobalExternalFreedSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetThreadAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetThreadAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetThreadExternalAllocCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetThreadExternalAllocSize",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "resetThreadGcInvocationCount",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "dumpHprofData",
- args = {String.class}
- )
- })
public void testGetAndReset() throws IOException {
final String dumpFile = getFileName();
Debug.startAllocCounting();
diff --git a/tests/tests/os/src/android/os/cts/StatFsTest.java b/tests/tests/os/src/android/os/cts/StatFsTest.java
index 5f0d781..e879611 100644
--- a/tests/tests/os/src/android/os/cts/StatFsTest.java
+++ b/tests/tests/os/src/android/os/cts/StatFsTest.java
@@ -82,6 +82,6 @@
assertTrue(blockSize > 0);
assertTrue(totalBlocks > 0);
assertTrue(freeBlocks >= availableBlocks);
- assertTrue(availableBlocks >= 0);
+ assertTrue(availableBlocks > 0);
}
}
diff --git a/tests/tests/permission/Android.mk b/tests/tests/permission/Android.mk
index c1f7f4d..5d251de 100644
--- a/tests/tests/permission/Android.mk
+++ b/tests/tests/permission/Android.mk
@@ -30,6 +30,6 @@
# uncomment when dalvik test annotations are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 3636225..4deb308 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -170,9 +170,14 @@
/**
* Verify that any publicly readable directories reachable from
- * the root directory are not writable. World writable directories
- * are a security hole and an application should only be able to
- * write to it's own home directory.
+ * the root directory are not writable. An application should only be
+ * able to write to it's own home directory. World writable directories
+ * are a security hole because they enable a number of different attacks.
+ * <ul>
+ * <li><a href="http://en.wikipedia.org/wiki/Symlink_race">Symlink Races</a></li>
+ * <li>Data destruction by deleting or renaming files you don't own</li>
+ * <li>Data substitution by replacing trusted files with untrusted files</li>
+ * </ul>
*
* Note: Because not all directories are readable, this is a best-effort
* test only. Writable directories within unreadable subdirectories
@@ -198,6 +203,7 @@
"/data/btips/TI/opp",
"/data/calibration",
"/data/dalvik-cache",
+ "/data/data",
"/data/data/.drm",
"/data/data/.drm/.wmdrm",
"/data/data/cw",
@@ -218,6 +224,9 @@
"/data/data/recovery",
"/data/dontpanic",
"/data/drm",
+ "/data/drm/fwdlock",
+ "/data/drm/IDM",
+ "/data/drm/IDM/HTTP",
"/data/drm/rights",
"/data/dump",
"/data/hwvefs",
@@ -265,9 +274,15 @@
/**
* Verify that directories not discoverable by
- * testAllOtherDirectoriesNotWritable are not writable. World
- * writable directories are a security hole and an application
- * should only be able to write to it's own home directory.
+ * testAllOtherDirectoriesNotWritable are not writable. An application
+ * should only be able to write to it's own home directory. World
+ * writable directories are a security hole because they enable a
+ * number of different attacks.
+ * <ul>
+ * <li><a href="http://en.wikipedia.org/wiki/Symlink_race">Symlink Races</a></li>
+ * <li>Data destruction by deleting or renaming files you don't own</li>
+ * <li>Data substitution by replacing trusted files with untrusted files</li>
+ * </ul>
*
* Because /data and /data/data are not readable, we blindly try to
* poke around in there looking for bad directories. There has to be
diff --git a/tests/tests/permission2/Android.mk b/tests/tests/permission2/Android.mk
index 9c62245..09fd104 100755
--- a/tests/tests/permission2/Android.mk
+++ b/tests/tests/permission2/Android.mk
@@ -27,5 +27,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/preference/Android.mk b/tests/tests/preference/Android.mk
index 886c166..7816c3b 100644
--- a/tests/tests/preference/Android.mk
+++ b/tests/tests/preference/Android.mk
@@ -30,4 +30,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/provider/Android.mk b/tests/tests/provider/Android.mk
index c33d98a..fba7cda 100644
--- a/tests/tests/provider/Android.mk
+++ b/tests/tests/provider/Android.mk
@@ -29,5 +29,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
index edab42f..c506a91 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
@@ -16,10 +16,10 @@
package android.provider.cts;
-import com.android.cts.stub.R;
-
import android.content.ContentResolver;
+import android.content.Context;
import android.content.IContentProvider;
+import android.os.cts.FileUtils;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Contacts;
@@ -28,7 +28,6 @@
import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
import android.test.InstrumentationTestCase;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -37,12 +36,16 @@
private static final byte[] EMPTY_TEST_PHOTO_DATA = "".getBytes();
+ private Context mContext;
+
private ContentResolver mResolver;
@Override
protected void setUp() throws Exception {
super.setUp();
- mResolver = getInstrumentation().getTargetContext().getContentResolver();
+
+ mContext= getInstrumentation().getTargetContext();
+ mResolver = mContext.getContentResolver();
IContentProvider provider = mResolver.acquireProvider(ContactsContract.AUTHORITY);
mBuilder = new ContactsContract_TestDataBuilder(provider);
}
@@ -62,7 +65,7 @@
assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
- .with(Photo.PHOTO, getTestPhotoData())
+ .with(Photo.PHOTO, PhotoUtil.getTestPhotoData(mContext))
.insert();
photoData.load();
@@ -92,31 +95,10 @@
assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
}
- private byte[] getTestPhotoData() {
- InputStream input = getInstrumentation().getTargetContext().getResources()
- .openRawResource(R.drawable.testimage);
- return readInputStreamFully(input);
- }
-
- protected byte[] readInputStreamFully(InputStream is) {
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- byte[] buffer = new byte[10000];
- int count;
- try {
- while ((count = is.read(buffer)) != -1) {
- os.write(buffer, 0, count);
- }
- is.close();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return os.toByteArray();
- }
-
private void assertPhotoStream(InputStream photoStream) throws IOException {
try {
assertNotNull(photoStream);
- byte[] actualBytes = readInputStreamFully(photoStream);
+ byte[] actualBytes = FileUtils.readInputStreamFully(photoStream);
assertTrue(actualBytes.length > 0);
} finally {
if (photoStream != null) {
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemPhotosTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemPhotosTest.java
new file mode 100644
index 0000000..d45e824
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemPhotosTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.provider.cts;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract.StreamItemPhotos;
+import android.provider.ContactsContract.StreamItems;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_StreamItemPhotosTest extends AndroidTestCase {
+
+ private ContentResolver mResolver;
+
+ private Uri mStreamItemUri;
+
+ private long mStreamItemId;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mResolver = mContext.getContentResolver();
+
+ long rawContactId = ContactsContract_StreamItemsTest.insertRawContact(mResolver);
+ mStreamItemUri = ContactsContract_StreamItemsTest.insertViaContentDirectoryUri(mResolver,
+ rawContactId);
+ mStreamItemId = ContentUris.parseId(mStreamItemUri);
+ assertTrue(mStreamItemId != -1);
+ }
+
+ public void testContentDirectoryUri() {
+ byte[] photoData = PhotoUtil.getTestPhotoData(mContext);
+ ContentValues values = new ContentValues();
+ values.put(StreamItemPhotos.SORT_INDEX, 1);
+ values.put(StreamItemPhotos.PHOTO, photoData);
+
+ Uri insertUri = Uri.withAppendedPath(
+ ContentUris.withAppendedId(StreamItems.CONTENT_URI, mStreamItemId),
+ StreamItems.StreamItemPhotos.CONTENT_DIRECTORY);
+ Uri uri = mResolver.insert(insertUri, values);
+ long photoId = ContentUris.parseId(uri);
+ assertTrue(photoId != -1);
+ assertEquals(Uri.withAppendedPath(insertUri, Long.toString(photoId)), uri);
+ }
+
+ public void testContentPhotoUri() {
+ byte[] photoData = PhotoUtil.getTestPhotoData(mContext);
+ ContentValues values = new ContentValues();
+ values.put(StreamItemPhotos.STREAM_ITEM_ID, mStreamItemId);
+ values.put(StreamItemPhotos.SORT_INDEX, 1);
+ values.put(StreamItemPhotos.PHOTO, photoData);
+
+ Uri uri = mResolver.insert(StreamItems.CONTENT_PHOTO_URI, values);
+ long photoId = ContentUris.parseId(uri);
+ assertTrue(photoId != -1);
+ assertEquals(Uri.withAppendedPath(StreamItems.CONTENT_PHOTO_URI,
+ Long.toString(photoId)), uri);
+ }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
index 5ca04ab..f8135aa 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
@@ -53,27 +53,8 @@
}
public void testContentDirectoryUri() throws Exception {
- // Create a contact to attach the stream item to it.
- ContentValues values = new ContentValues();
- values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
- values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
-
- Uri contactUri = mResolver.insert(RawContacts.CONTENT_URI, values);
- long rawContactId = ContentUris.parseId(contactUri);
- assertTrue(rawContactId != -1);
-
- // Attach a stream item to the contact.
- values.clear();
- values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
- values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
- values.put(StreamItems.TEXT, INSERT_TEXT);
- values.put(StreamItems.TIMESTAMP, INSERT_TIMESTAMP);
- values.put(StreamItems.COMMENTS, INSERT_COMMENTS);
-
- Uri contactStreamUri = Uri.withAppendedPath(
- ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId),
- RawContacts.StreamItems.CONTENT_DIRECTORY);
- Uri streamItemUri = mResolver.insert(contactStreamUri, values);
+ long rawContactId = insertRawContact(mResolver);
+ Uri streamItemUri = insertViaContentDirectoryUri(mResolver, rawContactId);
long streamItemId = ContentUris.parseId(streamItemUri);
assertTrue(streamItemId != -1);
@@ -88,7 +69,7 @@
assertInsertedItem(streamItemUri);
// Update the stream item.
- values.clear();
+ ContentValues values = new ContentValues();
values.put(Data.RAW_CONTACT_ID, rawContactId);
values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
@@ -100,6 +81,33 @@
assertUpdatedItem(streamItemUri);
}
+ static long insertRawContact(ContentResolver resolver) {
+ // Create a contact to attach the stream item to it.
+ ContentValues values = new ContentValues();
+ values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+ values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+
+ Uri contactUri = resolver.insert(RawContacts.CONTENT_URI, values);
+ long rawContactId = ContentUris.parseId(contactUri);
+ assertTrue(rawContactId != -1);
+ return rawContactId;
+ }
+
+ static Uri insertViaContentDirectoryUri(ContentResolver resolver, long rawContactId) {
+ // Attach a stream item to the contact.
+ ContentValues values = new ContentValues();
+ values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+ values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+ values.put(StreamItems.TEXT, INSERT_TEXT);
+ values.put(StreamItems.TIMESTAMP, INSERT_TIMESTAMP);
+ values.put(StreamItems.COMMENTS, INSERT_COMMENTS);
+
+ Uri contactStreamUri = Uri.withAppendedPath(
+ ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId),
+ RawContacts.StreamItems.CONTENT_DIRECTORY);
+ return resolver.insert(contactStreamUri, values);
+ }
+
public void testContentUri() throws Exception {
// Create a contact with one stream item in it.
ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
index 5203326..e746e74 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
@@ -26,6 +26,7 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Environment;
+import android.os.cts.FileUtils;
import android.provider.MediaStore.Images.Media;
import android.provider.MediaStore.Images.Thumbnails;
import android.test.InstrumentationTestCase;
@@ -193,7 +194,7 @@
"/testimage1.jpg";
int numBytes = 1337;
- FileCopyHelper.createFile(new File(externalPath), numBytes);
+ FileUtils.createFile(new File(externalPath), numBytes);
ContentValues values = new ContentValues();
values.put(Media.ORIENTATION, 0);
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
index 6f7842c..9312bc6 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
@@ -25,6 +25,7 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
+import android.os.cts.FileUtils;
import android.provider.MediaStore;
import android.provider.MediaStore.Video.Media;
import android.test.InstrumentationTestCase;
@@ -65,7 +66,7 @@
"/video/testvideo1.3gp";
int numBytes = 1337;
- FileCopyHelper.createFile(new File(externalVideoPath), numBytes);
+ FileUtils.createFile(new File(externalVideoPath), numBytes);
ContentValues values = new ContentValues();
values.put(Media.ALBUM, "cts");
diff --git a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
index 1395de1..a17bcdd 100644
--- a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
@@ -16,21 +16,15 @@
package android.provider.cts;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.provider.SearchRecentSuggestions;
import android.test.ProviderTestCase2;
-import android.view.animation.cts.DelayedCheck;
-@TestTargetClass(android.provider.SearchRecentSuggestions.class)
public class SearchRecentSuggestionsTest extends
ProviderTestCase2<TestSearchRecentSuggestionsProvider> {
private final static String AUTHORITY_HEAD = "content://"
@@ -38,14 +32,14 @@
private Uri mTestUri;
private TestSearchRecentSuggestionsProvider mTestSRSProvider;
- private Context mContext;
+ private Context mProviderContext;
@Override
public void setUp() throws Exception {
super.setUp();
mTestUri = Uri.parse(AUTHORITY_HEAD + "/suggestions");
mTestSRSProvider = getProvider();
- mContext = mTestSRSProvider.getContext();
+ mProviderContext = mTestSRSProvider.getContext();
}
public SearchRecentSuggestionsTest() {
@@ -53,40 +47,13 @@
TestSearchRecentSuggestionsProvider.AUTHORITY);
}
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "SearchRecentSuggestions",
- args = {android.content.Context.class, java.lang.String.class, int.class}
- )
public void testConstructor() {
- new SearchRecentSuggestions(mContext, TestSearchRecentSuggestionsProvider.AUTHORITY,
+ new SearchRecentSuggestions(mProviderContext, TestSearchRecentSuggestionsProvider.AUTHORITY,
TestSearchRecentSuggestionsProvider.MODE);
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "SearchRecentSuggestions",
- args = {android.content.Context.class, java.lang.String.class, int.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "saveRecentQuery",
- args = {java.lang.String.class, java.lang.String.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "clearHistory",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "truncateHistory",
- args = {android.content.ContentResolver.class, int.class}
- )
- })
public void testSearchRecentSuggestions() {
- MySearchRecentSuggestions srs = new MySearchRecentSuggestions(mContext,
+ SearchRecentSuggestions srs = new MySearchRecentSuggestions(mProviderContext,
TestSearchRecentSuggestionsProvider.AUTHORITY,
TestSearchRecentSuggestionsProvider.MODE);
Cursor c = mTestSRSProvider.query(mTestUri, null, null, null, null);
@@ -123,8 +90,8 @@
waitForCursorCount(mTestUri, null, 3);
// truncateHistory will delete the oldest one record
- ContentResolver cr = mContext.getContentResolver();
- srs.truncateHistory(cr, 2);
+ ContentResolver cr = mProviderContext.getContentResolver();
+ ((MySearchRecentSuggestions) srs).truncateHistory(cr, 2);
waitForCursorCount(mTestUri, SearchRecentSuggestions.QUERIES_PROJECTION_2LINE, 2);
@@ -220,6 +187,7 @@
super(context, authority, mode);
}
+ @Override
protected void truncateHistory(ContentResolver cr, int maxEntries) {
super.truncateHistory(cr, maxEntries);
}
@@ -227,7 +195,8 @@
private void waitForCursorCount(final Uri uri, final String[] projection,
final int expectedCount) {
- new DelayedCheck() {
+ new PollingCheck() {
+ @Override
protected boolean check() {
Cursor cursor = null;
try {
diff --git a/tests/tests/provider/src/android/provider/cts/VoicemailContractTest.java b/tests/tests/provider/src/android/provider/cts/VoicemailContractTest.java
new file mode 100644
index 0000000..98d8b58
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/VoicemailContractTest.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.provider.cts;
+
+import android.content.ContentResolver;
+
+import android.content.ContentValues;
+import android.content.IContentProvider;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.VoicemailContract;
+import android.provider.VoicemailContract.Voicemails;
+import android.provider.VoicemailContract.Status;
+import android.test.InstrumentationTestCase;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+
+/**
+ * CTS tests for voicemail provider accessed through {@link VoicemailContract}.
+ */
+public class VoicemailContractTest extends InstrumentationTestCase {
+ private ContentResolver mContentResolver;
+ private IContentProvider mVoicemailProvider;
+ private IContentProvider mStatusProvider;
+ private Uri mVoicemailContentUri;
+ private Uri mStatusContentUri;
+ private String mSourcePackageName;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mSourcePackageName = getInstrumentation().getTargetContext().getPackageName();
+ mVoicemailContentUri = Voicemails.buildSourceUri(mSourcePackageName);
+ mStatusContentUri = Status.buildSourceUri(mSourcePackageName);
+ mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
+ mVoicemailProvider = mContentResolver.acquireProvider(mVoicemailContentUri);
+ mStatusProvider = mContentResolver.acquireProvider(mStatusContentUri);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Clean up, just in case we failed to delete the entry when a test failed.
+ // The cotentUris are specific to this package, so this will delete only the
+ // entries inserted by this package.
+ mStatusProvider.delete(mStatusContentUri, null, null);
+ mVoicemailProvider.delete(mVoicemailContentUri, null, null);
+ super.tearDown();
+ }
+
+ public void testVoicemailsTable() throws Exception {
+ final String[] VOICEMAILS_PROJECTION = new String[] {
+ Voicemails._ID, Voicemails.NUMBER, Voicemails.DATE, Voicemails.DURATION,
+ Voicemails.IS_READ, Voicemails.SOURCE_PACKAGE, Voicemails.SOURCE_DATA,
+ Voicemails.HAS_CONTENT, Voicemails.MIME_TYPE};
+ final int ID_INDEX = 0;
+ final int NUMBER_INDEX = 1;
+ final int DATE_INDEX = 2;
+ final int DURATION_INDEX = 3;
+ final int IS_READ_INDEX = 4;
+ final int SOURCE_PACKAGE_INDEX = 5;
+ final int SOURCE_DATA_INDEX = 6;
+ final int HAS_CONTENT_INDEX = 7;
+ final int MIME_TYPE_INDEX = 8;
+
+ String insertCallsNumber = "0123456789";
+ long insertCallsDuration = 120;
+ String insertSourceData = "internal_id";
+ String insertMimeType = "audio/mp3";
+ long insertDate = 1324478862000L;
+
+ String updateCallsNumber = "9876543210";
+ long updateCallsDuration = 310;
+ String updateSourceData = "another_id";
+ long updateDate = 1324565262000L;
+
+ // Test: insert
+ ContentValues value = new ContentValues();
+ value.put(Voicemails.NUMBER, insertCallsNumber);
+ value.put(Voicemails.DATE, insertDate);
+ value.put(Voicemails.DURATION, insertCallsDuration);
+ // Source package is expected to be inserted by the provider, if not set.
+ value.put(Voicemails.SOURCE_DATA, insertSourceData);
+ value.put(Voicemails.MIME_TYPE, insertMimeType);
+ value.put(Voicemails.IS_READ, false);
+ value.put(Voicemails.HAS_CONTENT, true);
+
+ Uri uri = mVoicemailProvider.insert(mVoicemailContentUri, value);
+ Cursor cursor = mVoicemailProvider.query(
+ mVoicemailContentUri, VOICEMAILS_PROJECTION,
+ Voicemails.NUMBER + " = ?",
+ new String[] {insertCallsNumber}, null);
+ assertTrue(cursor.moveToNext());
+ assertEquals(insertCallsNumber, cursor.getString(NUMBER_INDEX));
+ assertEquals(insertDate, cursor.getLong(DATE_INDEX));
+ assertEquals(insertCallsDuration, cursor.getLong(DURATION_INDEX));
+ assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+ assertEquals(insertSourceData, cursor.getString(SOURCE_DATA_INDEX));
+ assertEquals(insertMimeType, cursor.getString(MIME_TYPE_INDEX));
+ assertEquals(0, cursor.getInt(IS_READ_INDEX));
+ assertEquals(1, cursor.getInt(HAS_CONTENT_INDEX));
+ int id = cursor.getInt(ID_INDEX);
+ assertEquals(id, Integer.parseInt(uri.getLastPathSegment()));
+ cursor.close();
+
+ // Test: update
+ value.clear();
+ value.put(Voicemails.NUMBER, updateCallsNumber);
+ value.put(Voicemails.DATE, updateDate);
+ value.put(Voicemails.DURATION, updateCallsDuration);
+ value.put(Voicemails.SOURCE_DATA, updateSourceData);
+
+ mVoicemailProvider.update(uri, value, null, null);
+ cursor = mVoicemailProvider.query(mVoicemailContentUri, VOICEMAILS_PROJECTION,
+ Voicemails._ID + " = " + id, null, null);
+ assertEquals(1, cursor.getCount());
+ assertTrue(cursor.moveToNext());
+ assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+ assertEquals(updateCallsNumber, cursor.getString(NUMBER_INDEX));
+ assertEquals(updateDate, cursor.getLong(DATE_INDEX));
+ assertEquals(updateCallsDuration, cursor.getLong(DURATION_INDEX));
+ assertEquals(updateSourceData, cursor.getString(SOURCE_DATA_INDEX));
+ cursor.close();
+
+ // Test: delete
+ mVoicemailProvider.delete(mVoicemailContentUri, Voicemails._ID + " = " + id, null);
+ cursor = mVoicemailProvider.query(mVoicemailContentUri, VOICEMAILS_PROJECTION,
+ Voicemails._ID + " = " + id, null, null);
+ assertEquals(0, cursor.getCount());
+ cursor.close();
+ }
+
+ public void testStatusTable() throws Exception {
+ final String[] STATUS_PROJECTION = new String[] {
+ Status._ID, Status.SOURCE_PACKAGE, Status.CONFIGURATION_STATE,
+ Status.DATA_CHANNEL_STATE, Status.NOTIFICATION_CHANNEL_STATE,
+ Status.SETTINGS_URI, Status.VOICEMAIL_ACCESS_URI};
+ final int ID_INDEX = 0;
+ final int SOURCE_PACKAGE_INDEX = 1;
+ final int CONFIGURATION_STATE_INDEX = 2;
+ final int DATA_CHANNEL_STATE_INDEX = 3;
+ final int NOTIFICATION_CHANNEL_STATE_INDEX = 4;
+ final int SETTINGS_URI_INDEX = 5;
+ final int VOICEMAIL_ACCESS_URI_INDEX = 6;
+
+ int insertConfigurationState = Status.CONFIGURATION_STATE_OK;
+ int insertDataChannelState = Status.DATA_CHANNEL_STATE_OK;
+ int insertNotificationChannelState = Status.NOTIFICATION_CHANNEL_STATE_OK;
+ String insertSettingsUri = "settings_uri";
+ String insertVoicemailAccessUri = "tel:901";
+
+ int updateDataChannelState = Status.DATA_CHANNEL_STATE_NO_CONNECTION;
+ int updateNotificationChannelState = Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING;
+ String updateSettingsUri = "settings_uri_2";
+
+ // Test: insert
+ ContentValues value = new ContentValues();
+ value.put(Status.CONFIGURATION_STATE, insertConfigurationState);
+ value.put(Status.DATA_CHANNEL_STATE, insertDataChannelState);
+ value.put(Status.NOTIFICATION_CHANNEL_STATE, insertNotificationChannelState);
+ value.put(Status.SETTINGS_URI, insertSettingsUri);
+ value.put(Status.VOICEMAIL_ACCESS_URI, insertVoicemailAccessUri);
+
+ Uri uri = mStatusProvider.insert(mStatusContentUri, value);
+ Cursor cursor = mStatusProvider.query(
+ mStatusContentUri, STATUS_PROJECTION, null, null, null);
+ assertTrue(cursor.moveToNext());
+ assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+ assertEquals(insertConfigurationState, cursor.getInt(CONFIGURATION_STATE_INDEX));
+ assertEquals(insertDataChannelState, cursor.getInt(DATA_CHANNEL_STATE_INDEX));
+ assertEquals(insertNotificationChannelState,
+ cursor.getInt(NOTIFICATION_CHANNEL_STATE_INDEX));
+ assertEquals(insertSettingsUri, cursor.getString(SETTINGS_URI_INDEX));
+ assertEquals(insertVoicemailAccessUri, cursor.getString(VOICEMAIL_ACCESS_URI_INDEX));
+ int id = cursor.getInt(ID_INDEX);
+ assertEquals(id, Integer.parseInt(uri.getLastPathSegment()));
+ cursor.close();
+
+ // Test: update
+ value.clear();
+ value.put(Status.DATA_CHANNEL_STATE, updateDataChannelState);
+ value.put(Status.NOTIFICATION_CHANNEL_STATE, updateNotificationChannelState);
+ value.put(Status.SETTINGS_URI, updateSettingsUri);
+
+ mStatusProvider.update(uri, value, null, null);
+ cursor = mStatusProvider.query(mStatusContentUri, STATUS_PROJECTION,
+ Voicemails._ID + " = " + id, null, null);
+ assertEquals(1, cursor.getCount());
+ assertTrue(cursor.moveToNext());
+ assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+ assertEquals(updateDataChannelState, cursor.getInt(DATA_CHANNEL_STATE_INDEX));
+ assertEquals(updateNotificationChannelState,
+ cursor.getInt(NOTIFICATION_CHANNEL_STATE_INDEX));
+ assertEquals(updateSettingsUri, cursor.getString(SETTINGS_URI_INDEX));
+ cursor.close();
+
+ // Test: delete
+ mStatusProvider.delete(mStatusContentUri, Voicemails._ID + " = " + id, null);
+ cursor = mStatusProvider.query(mStatusContentUri, STATUS_PROJECTION,
+ Voicemails._ID + " = " + id, null, null);
+ assertEquals(0, cursor.getCount());
+ cursor.close();
+ }
+
+ public void testVoicemailTablePermissions() throws Exception {
+ ContentValues value = new ContentValues();
+ value.put(Voicemails.NUMBER, "0123456789");
+ value.put(Voicemails.SOURCE_PACKAGE, "some.other.package");
+ try {
+ mVoicemailProvider.insert(mVoicemailContentUri, value);
+ fail("Expected SecurityException. None thrown.");
+ } catch (SecurityException e) {
+ // Expected result.
+ }
+ }
+
+ public void testStatusTablePermissions() throws Exception {
+ ContentValues value = new ContentValues();
+ value.put(Status.CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);
+ value.put(Status.SOURCE_PACKAGE, "some.other.package");
+ try {
+ mStatusProvider.insert(mStatusContentUri, value);
+ fail("Expected SecurityException. None thrown.");
+ } catch (SecurityException e) {
+ // Expected result.
+ }
+ }
+}
diff --git a/tests/tests/renderscript/Android.mk b/tests/tests/renderscript/Android.mk
index fc64614..d2137e2 100644
--- a/tests/tests/renderscript/Android.mk
+++ b/tests/tests/renderscript/Android.mk
@@ -34,4 +34,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ForEachTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ForEachTest.java
index 12c8fb0..a64d1d9 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ForEachTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ForEachTest.java
@@ -67,8 +67,10 @@
t = new Type.Builder(mRS, Element.U8(mRS)).setX(x).create();
Allocation out = Allocation.createTyped(mRS, t);
fe_i8.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -82,8 +84,10 @@
t = new Type.Builder(mRS, Element.U8_2(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i8_2.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8_2.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -97,8 +101,10 @@
t = new Type.Builder(mRS, Element.U8_3(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i8_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -112,8 +118,10 @@
t = new Type.Builder(mRS, Element.U8_4(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i8_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -125,8 +133,10 @@
t = new Type.Builder(mRS, Element.U16(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i16.forEach_root(in, out);
+ mRS.finish();
try {
fe_i16.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -140,8 +150,10 @@
t = new Type.Builder(mRS, Element.U16_2(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i16_2.forEach_root(in, out);
+ mRS.finish();
try {
fe_i16_2.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -155,8 +167,10 @@
t = new Type.Builder(mRS, Element.U16_3(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i16_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_i16_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -170,8 +184,10 @@
t = new Type.Builder(mRS, Element.U16_4(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i16_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_i16_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -183,8 +199,10 @@
t = new Type.Builder(mRS, Element.U32(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i32.forEach_root(in, out);
+ mRS.finish();
try {
fe_i32.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -198,8 +216,10 @@
t = new Type.Builder(mRS, Element.U32_2(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i32_2.forEach_root(in, out);
+ mRS.finish();
try {
fe_i32_2.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -213,8 +233,10 @@
t = new Type.Builder(mRS, Element.U32_3(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i32_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_i32_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -228,8 +250,10 @@
t = new Type.Builder(mRS, Element.U32_4(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i32_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_i32_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -241,8 +265,10 @@
t = new Type.Builder(mRS, Element.U64(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i64.forEach_root(in, out);
+ mRS.finish();
try {
fe_i64.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -256,8 +282,10 @@
t = new Type.Builder(mRS, Element.U64_2(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i64_2.forEach_root(in, out);
+ mRS.finish();
try {
fe_i64_2.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -271,8 +299,10 @@
t = new Type.Builder(mRS, Element.U64_3(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i64_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_i64_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -286,8 +316,10 @@
t = new Type.Builder(mRS, Element.U64_4(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i64_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_i64_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -298,8 +330,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f32.forEach_root(in, out);
+ mRS.finish();
try {
fe_f32.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -313,8 +347,10 @@
t = new Type.Builder(mRS, Element.F32_2(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_f32_2.forEach_root(in, out);
+ mRS.finish();
try {
fe_f32_2.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -327,8 +363,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f32_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_f32_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -341,8 +379,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f32_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_f32_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -353,8 +393,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f64.forEach_root(in, out);
+ mRS.finish();
try {
fe_f64.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -367,8 +409,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f64_2.forEach_root(in, out);
+ mRS.finish();
try {
fe_f64_2.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -381,8 +425,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f64_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_f64_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -395,8 +441,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_f64_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_f64_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -408,8 +456,10 @@
in = new ScriptField_fe_test(mRS, x).getAllocation();
out = new ScriptField_fe_test(mRS, x).getAllocation();
fe_struct.forEach_root(in, out);
+ mRS.finish();
try {
fe_struct.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -420,8 +470,10 @@
in = Allocation.createTyped(mRS, t);
out = Allocation.createTyped(mRS, t);
fe_bool.forEach_root(in, out);
+ mRS.finish();
try {
fe_bool.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -432,8 +484,10 @@
t = new Type.Builder(mRS, Element.A_8(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i8.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -444,8 +498,10 @@
t = new Type.Builder(mRS, Element.RGBA_8888(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i8_4.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8_4.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
@@ -456,8 +512,10 @@
t = new Type.Builder(mRS, Element.RGB_888(mRS)).setX(x).create();
out = Allocation.createTyped(mRS, t);
fe_i8_3.forEach_root(in, out);
+ mRS.finish();
try {
fe_i8_3.forEach_root(in, badOut);
+ mRS.finish();
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
diff --git a/tests/tests/sax/Android.mk b/tests/tests/sax/Android.mk
index 749588a..9dc1847 100644
--- a/tests/tests/sax/Android.mk
+++ b/tests/tests/sax/Android.mk
@@ -29,4 +29,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/security/Android.mk b/tests/tests/security/Android.mk
index 6ea5e1b..ef13886 100644
--- a/tests/tests/security/Android.mk
+++ b/tests/tests/security/Android.mk
@@ -28,4 +28,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/security/src/android/security/cts/AslrTest.java b/tests/tests/security/src/android/security/cts/AslrTest.java
new file mode 100644
index 0000000..a4c4f80
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/AslrTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import junit.framework.TestCase;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+/**
+ * Verify that ASLR is properly enabled on Android Compatible devices.
+ */
+public class AslrTest extends TestCase {
+
+ public void testOneExecutableIsPie() throws IOException {
+ assertTrue(ReadElf.read(new File("/system/bin/cat")).isPIE());
+ }
+
+ public void testVaRandomize() throws IOException {
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new FileReader("/proc/sys/kernel/randomize_va_space"));
+ int level = Integer.parseInt(in.readLine().trim());
+ assertTrue("Expected /proc/sys/kernel/randomize_va_space to be "
+ + "greater than or equal to 2, got " + level,
+ level >= 2);
+ } catch (FileNotFoundException e) {
+ // Odd. The file doesn't exist... Assume ASLR is enabled.
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+}
diff --git a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
new file mode 100644
index 0000000..7198241
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import junit.framework.TestCase;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+/**
+ * Verify that the kernel is configured how we expect it to be
+ * configured.
+ */
+public class KernelSettingsTest extends TestCase {
+
+ /**
+ * Protect against kernel based NULL pointer attacks by enforcing a
+ * minimum (and maximum!) value of mmap_min_addr.
+ *
+ * http://lwn.net/Articles/342330/
+ * http://lwn.net/Articles/342420/
+ */
+ public void testMmapMinAddr() throws IOException {
+ try {
+ assertEquals("32768", getFile("/proc/sys/vm/mmap_min_addr"));
+ } catch (FileNotFoundException e) {
+ // Odd. The file doesn't exist... Assume we're ok.
+ }
+ }
+
+ /**
+ * /proc/kallsyms will show the address of exported kernel symbols. This
+ * information can be used to write a reliable kernel exploit that can run
+ * on many platforms without using hardcoded pointers. To make this more
+ * difficult for attackers, don't export kernel symbols.
+ */
+ public void testKptrRestrict() throws IOException {
+ try {
+ assertEquals("2", getFile("/proc/sys/kernel/kptr_restrict"));
+ } catch (FileNotFoundException e) {
+ // Odd. The file doesn't exist... Assume we're ok.
+ }
+ }
+
+ private String getFile(String filename) throws IOException {
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new FileReader(filename));
+ return in.readLine().trim();
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+}
diff --git a/tests/tests/security/src/android/security/cts/ListeningPortsTest.java b/tests/tests/security/src/android/security/cts/ListeningPortsTest.java
new file mode 100644
index 0000000..f3112a3
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/ListeningPortsTest.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.regex.Pattern;
+
+/**
+ * Verifies that Android devices are not listening on accessible
+ * open ports. Open ports are often targeted by attackers looking to break
+ * into computer systems remotely, and minimizing the number of open ports
+ * is considered a security best practice.
+ */
+public class ListeningPortsTest extends TestCase {
+
+ /** Ports that are allowed to be listening. */
+ private static final List<String> EXCEPTION_PATTERNS = new ArrayList<String>(6);
+
+ static {
+ // IPv4 exceptions
+ EXCEPTION_PATTERNS.add("0.0.0.0:5555"); // emulator port
+ EXCEPTION_PATTERNS.add("10.0.2.15:5555"); // net forwarding for emulator
+ EXCEPTION_PATTERNS.add("127.0.0.1:5037"); // adb daemon "smart sockets"
+ }
+
+ /**
+ * Remotely accessible ports are often used by attackers to gain
+ * unauthorized access to computers systems without user knowledge or
+ * awareness.
+ */
+ public void testNoRemotelyAccessibleListeningTcpPorts() throws Exception {
+ assertNoAccessibleListeningPorts("/proc/net/tcp", true, false);
+ }
+
+ /**
+ * Remotely accessible ports are often used by attackers to gain
+ * unauthorized access to computers systems without user knowledge or
+ * awareness.
+ */
+ public void testNoRemotelyAccessibleListeningTcp6Ports() throws Exception {
+ assertNoAccessibleListeningPorts("/proc/net/tcp6", true, false);
+ }
+
+ /**
+ * Remotely accessible ports are often used by attackers to gain
+ * unauthorized access to computers systems without user knowledge or
+ * awareness.
+ */
+ public void testNoRemotelyAccessibleListeningUdpPorts() throws Exception {
+ assertNoRemotelyAccessibleListeningUdpPorts("/proc/net/udp", false);
+ }
+
+ /**
+ * Remotely accessible ports are often used by attackers to gain
+ * unauthorized access to computers systems without user knowledge or
+ * awareness.
+ */
+ public void testNoRemotelyAccessibleListeningUdp6Ports() throws Exception {
+ assertNoRemotelyAccessibleListeningUdpPorts("/proc/net/udp6", false);
+ }
+
+ /**
+ * Locally accessible ports are often targeted by malicious locally
+ * installed programs to gain unauthorized access to program data or
+ * cause system corruption.
+ *
+ * In all cases, a local listening IP port can be replaced by a UNIX domain
+ * socket. Unix domain sockets can be protected with unix filesystem
+ * permission. Alternatively, you can use getsockopt(SO_PEERCRED) to
+ * determine if a program is authorized to connect to your socket.
+ *
+ * Please convert loopback IP connections to unix domain sockets.
+ */
+ public void testNoListeningLoopbackTcpPorts() throws Exception {
+ assertNoAccessibleListeningPorts("/proc/net/tcp", true, true);
+ }
+
+ /**
+ * Locally accessible ports are often targeted by malicious locally
+ * installed programs to gain unauthorized access to program data or
+ * cause system corruption.
+ *
+ * In all cases, a local listening IP port can be replaced by a UNIX domain
+ * socket. Unix domain sockets can be protected with unix filesystem
+ * permission. Alternatively, you can use getsockopt(SO_PEERCRED) to
+ * determine if a program is authorized to connect to your socket.
+ *
+ * Please convert loopback IP connections to unix domain sockets.
+ */
+ public void testNoListeningLoopbackTcp6Ports() throws Exception {
+ assertNoAccessibleListeningPorts("/proc/net/tcp6", true, true);
+ }
+
+ /**
+ * Locally accessible ports are often targeted by malicious locally
+ * installed programs to gain unauthorized access to program data or
+ * cause system corruption.
+ *
+ * In all cases, a local listening IP port can be replaced by a UNIX domain
+ * socket. Unix domain sockets can be protected with unix filesystem
+ * permission. Alternately, or you can use setsockopt(SO_PASSCRED) to
+ * send credentials, and recvmsg to retrieve the passed credentials.
+ *
+ * Please convert loopback IP connections to unix domain sockets.
+ */
+ public void testNoListeningLoopbackUdpPorts() throws Exception {
+ assertNoAccessibleListeningPorts("/proc/net/udp", false, true);
+ }
+
+ /**
+ * Locally accessible ports are often targeted by malicious locally
+ * installed programs to gain unauthorized access to program data or
+ * cause system corruption.
+ *
+ * In all cases, a local listening IP port can be replaced by a UNIX domain
+ * socket. Unix domain sockets can be protected with unix filesystem
+ * permission. Alternately, or you can use setsockopt(SO_PASSCRED) to
+ * send credentials, and recvmsg to retrieve the passed credentials.
+ *
+ * Please convert loopback IP connections to unix domain sockets.
+ */
+ public void testNoListeningLoopbackUdp6Ports() throws Exception {
+ assertNoAccessibleListeningPorts("/proc/net/udp6", false, true);
+ }
+
+ private static final int RETRIES_MAX = 6;
+
+ /**
+ * UDP tests can be flaky due to DNS lookups. Compensate.
+ */
+ private static void assertNoRemotelyAccessibleListeningUdpPorts(
+ String procFilePath, boolean loopback)
+ throws Exception {
+ for (int i = 0; i < RETRIES_MAX; i++) {
+ try {
+ assertNoAccessibleListeningPorts(procFilePath, false, loopback);
+ return;
+ } catch (ListeningPortsAssertionError e) {
+ if (i == RETRIES_MAX - 1) {
+ throw e;
+ }
+ Thread.sleep(2 * 1000 * i);
+ }
+ }
+ throw new IllegalStateException("unreachable");
+ }
+
+ /**
+ * Remotely accessible ports (loopback==false) are often used by
+ * attackers to gain unauthorized access to computers systems without
+ * user knowledge or awareness.
+ *
+ * Locally accessible ports (loopback==true) are often targeted by
+ * malicious locally installed programs to gain unauthorized access to
+ * program data or cause system corruption.
+ */
+ private static void assertNoAccessibleListeningPorts(
+ String procFilePath, boolean isTcp, boolean loopback) throws IOException {
+ String errors = "";
+ List<ParsedProcEntry> entries = ParsedProcEntry.parse(procFilePath);
+ for (ParsedProcEntry entry : entries) {
+ String addrPort = entry.localAddress.getHostAddress() + ':' + entry.port;
+
+ if (isPortListening(entry.state, isTcp)
+ && !isException(addrPort)
+ && (!entry.localAddress.isLoopbackAddress() ^ loopback)) {
+ errors += "\nFound port listening on addr="
+ + entry.localAddress.getHostAddress() + ", port="
+ + entry.port + ", UID=" + entry.uid + " in "
+ + procFilePath;
+ }
+ }
+ if (!errors.equals("")) {
+ fail(errors);
+ }
+ }
+
+ private static boolean isException(String localAddress) {
+ return isPatternMatch(EXCEPTION_PATTERNS, localAddress);
+ }
+
+ private static boolean isPatternMatch(List<String> patterns, String input) {
+ for (String pattern : patterns) {
+ pattern = Pattern.quote(pattern);
+ if (Pattern.matches(pattern, input)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean isPortListening(String state, boolean isTcp) {
+ // 0A = TCP_LISTEN from include/net/tcp_states.h
+ String listeningState = isTcp ? "0A" : "07";
+ return listeningState.equals(state);
+ }
+
+ private static class ListeningPortsAssertionError extends AssertionFailedError {
+ private ListeningPortsAssertionError(String msg) {
+ super(msg);
+ }
+ }
+
+ private static class ParsedProcEntry {
+ private final InetAddress localAddress;
+ private final int port;
+ private final String state;
+ private final int uid;
+
+ private ParsedProcEntry(InetAddress addr, int port, String state, int uid) {
+ this.localAddress = addr;
+ this.port = port;
+ this.state = state;
+ this.uid = uid;
+ }
+
+
+ private static List<ParsedProcEntry> parse(String procFilePath) throws IOException {
+
+ List<ParsedProcEntry> retval = new ArrayList<ParsedProcEntry>();
+ /*
+ * Sample output of "cat /proc/net/tcp" on emulator:
+ *
+ * sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid ...
+ * 0: 0100007F:13AD 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 ...
+ * 1: 00000000:15B3 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 ...
+ * 2: 0F02000A:15B3 0202000A:CE8A 01 00000000:00000000 00:00000000 00000000 0 ...
+ *
+ */
+
+ File procFile = new File(procFilePath);
+ Scanner scanner = null;
+ try {
+ scanner = new Scanner(procFile);
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine().trim();
+
+ // Skip column headers
+ if (line.startsWith("sl")) {
+ continue;
+ }
+
+ String[] fields = line.split("\\s+");
+ final int expectedNumColumns = 12;
+ assertTrue(procFilePath + " should have at least " + expectedNumColumns
+ + " columns of output " + fields, fields.length >= expectedNumColumns);
+
+ String state = fields[3];
+ int uid = Integer.parseInt(fields[7]);
+ InetAddress localIp = addrToInet(fields[1].split(":")[0]);
+ int localPort = Integer.parseInt(fields[1].split(":")[1], 16);
+
+ retval.add(new ParsedProcEntry(localIp, localPort, state, uid));
+ }
+ } finally {
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+ return retval;
+ }
+
+ /**
+ * Convert a string stored in little endian format to an IP address.
+ */
+ private static InetAddress addrToInet(String s) throws UnknownHostException {
+ int len = s.length();
+ if (len != 8 && len != 32) {
+ throw new IllegalArgumentException(len + "");
+ }
+ byte[] retval = new byte[len / 2];
+
+ for (int i = 0; i < len / 2; i += 4) {
+ retval[i] = (byte) ((Character.digit(s.charAt(2*i + 6), 16) << 4)
+ + Character.digit(s.charAt(2*i + 7), 16));
+ retval[i + 1] = (byte) ((Character.digit(s.charAt(2*i + 4), 16) << 4)
+ + Character.digit(s.charAt(2*i + 5), 16));
+ retval[i + 2] = (byte) ((Character.digit(s.charAt(2*i + 2), 16) << 4)
+ + Character.digit(s.charAt(2*i + 3), 16));
+ retval[i + 3] = (byte) ((Character.digit(s.charAt(2*i), 16) << 4)
+ + Character.digit(s.charAt(2*i + 1), 16));
+ }
+ return InetAddress.getByAddress(retval);
+ }
+ }
+}
diff --git a/tests/tests/security/src/android/security/cts/PIILogTest.java b/tests/tests/security/src/android/security/cts/PIILogTest.java
new file mode 100644
index 0000000..d7ed5c4
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/PIILogTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.location.Address;
+import android.location.Geocoder;
+import android.location.Location;
+import android.location.LocationManager;
+import android.telephony.SmsManager;
+import android.telephony.TelephonyManager;
+import android.test.AndroidTestCase;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.List;
+
+public class PIILogTest extends AndroidTestCase {
+
+ private boolean mHasLocation;
+ private boolean mIsPhone;
+ private LocationManager mLocationManager;
+ private PackageManager mPackageManager;
+ private String mPhoneNumber;
+ private TelephonyManager mTelephonyManager;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ mPackageManager = mContext.getPackageManager();
+
+ mIsPhone = mPackageManager.hasSystemFeature(
+ PackageManager.FEATURE_TELEPHONY);
+ if (mIsPhone) {
+ mTelephonyManager = (TelephonyManager)mContext.getSystemService(
+ Context.TELEPHONY_SERVICE);
+ mPhoneNumber = mTelephonyManager.getLine1Number();
+ }
+
+ mHasLocation = mPackageManager.hasSystemFeature(PackageManager.FEATURE_LOCATION);
+ if (mHasLocation) {
+ mLocationManager = (LocationManager)mContext.getSystemService(Context.LOCATION_SERVICE);
+ }
+ }
+
+ private Location getLocation() {
+ return mLocationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+ }
+
+ public void testLogEmail() throws Exception {
+ // get the account manager
+ AccountManager accountManager = AccountManager.get(mContext);
+
+ // get all the accounts
+ Account[] accounts = accountManager.getAccounts();
+
+ // iterate over the accounts
+ for (Account accnt : accounts) {
+
+ // get the portion of the account prior to an '@', if present
+ String fullName = accnt.name;
+ String nameFragment = fullName;
+ int index = fullName.indexOf("@");
+ if (index > 0) {
+ nameFragment = fullName.substring(0, index);
+ }
+
+ // check to make sure this account doesn't show up in the logs
+ assertValueNotInLogs(nameFragment);
+ }
+ }
+
+ public void testLogPhoneCalls() throws Exception {
+ // check to make sure we're a phone...
+ if (mIsPhone && (mPhoneNumber != null)) {
+ assertValueNotInLogs(mPhoneNumber);
+ }
+ }
+
+ public void testLogIMEI() throws Exception {
+ // check to make sure we're a phone...
+ if (mIsPhone) {
+
+ // get our imei
+ String imei = mTelephonyManager.getDeviceId();
+
+ // check if the number shows up in logs
+ assertValueNotInLogs(imei);
+ }
+ }
+
+ public void testLogLocation() throws Exception {
+ // check to make sure we can get location data
+ if (mHasLocation) {
+
+ // try to get our location
+ Location location = getLocation();
+
+ // we didn't get it, and so need to bail.
+ // this is done to avoid a situation in which the test fails due
+ // to network conditions or a timeout.
+ if (location == null) {
+ return;
+ }
+
+ // get our latitude and longitude
+ double longitude = location.getLongitude();
+ double latitude = location.getLatitude();
+
+ // check if either of those show up in the logs
+ assertValueNotInLogs(Double.toString(longitude));
+
+ assertValueNotInLogs(Double.toString(latitude));
+
+ // get other names for where we are
+ Geocoder geo = new Geocoder(mContext);
+ List<Address> addresses = geo.getFromLocation(latitude, longitude, 10);
+
+ // iterate over those
+ for (Address addr : addresses) {
+ // we want to check for several interesting bits of data:
+ // 1. look for the locality
+ // 2. look for the sub-locality
+ // 3. look for the thoroughfare
+ // 4. look for the postal code
+ String locality = addr.getLocality();
+ if (locality != null) {
+ assertValueNotInLogs(locality);
+ }
+
+ String sublocality = addr.getSubLocality();
+ if (sublocality != null) {
+ assertValueNotInLogs(sublocality);
+ }
+
+ String thoroughfare = addr.getThoroughfare();
+ if (thoroughfare != null) {
+ assertValueNotInLogs(thoroughfare);
+ }
+
+ String postal_code = addr.getPostalCode();
+ if (postal_code != null) {
+ assertValueNotInLogs(postal_code);
+ }
+ }
+ }
+ }
+
+ public void testLogSMS() throws Exception {
+ // check to make sure we're a phone...
+ if (mIsPhone && (mPhoneNumber != null)) {
+
+ // send an SMS to our number
+ SmsManager manager = SmsManager.getDefault();
+ manager.sendTextMessage(mPhoneNumber, null, "%^&*(", null, null);
+
+ // check if that number shows up in logs
+ assertValueNotInLogs(mPhoneNumber);
+
+ // check if any message fragments show up in logs
+ assertValueNotInLogs("%^&*(");
+ }
+ }
+
+ private void assertValueNotInLogs(String value) throws Exception {
+ StringBuilder failLines = new StringBuilder();
+ Process process = Runtime.getRuntime().exec("logcat -d *:IWFSE");
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(process.getInputStream()));
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ if (line.contains(value)) {
+ failLines.append(line);
+ }
+ }
+ bufferedReader.close();
+ String message = failLines.toString();
+ assertTrue(message, message.isEmpty());
+ }
+}
diff --git a/tests/tests/security/src/android/security/cts/ReadElf.java b/tests/tests/security/src/android/security/cts/ReadElf.java
new file mode 100644
index 0000000..e311c9b
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/ReadElf.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+/**
+ * A poor man's implementation of the readelf command. This program is
+ * designed to parse ELF (Executable and Linkable Format) files.
+ */
+class ReadElf {
+ /** The magic values for the ELF identification. */
+ private static final byte[] ELF_IDENT = {
+ (byte) 0x7F, (byte) 'E', (byte) 'L', (byte) 'F',
+ };
+
+ /** Size of the e_ident[] structure in the ELF header. */
+ private static final int EI_NIDENT = 16;
+
+ /** Offset from end of ident structure in half-word sizes. */
+ private static final int OFFSET_TYPE = 0;
+
+ /** Machine type. */
+ private static final int OFFSET_MACHINE = 1;
+
+ /** ELF version. */
+ private static final int OFFSET_VERSION = 2;
+
+ /**
+ * The offset to which the system transfers control. e.g., the first thing
+ * executed.
+ */
+ private static final int OFFSET_ENTRY = 4;
+
+ /** Program header offset in bytes. */
+ private static final int OFFSET_PHOFF = 6;
+
+ /** Segment header offset in bytes. */
+ private static final int OFFSET_SHOFF = 8;
+
+ /** Processor-specific flags for binary. */
+ private static final int OFFSET_FLAGS = 10;
+
+ /** ELF header size in bytes. */
+ private static final int OFFSET_EHSIZE = 12;
+
+ /** All program headers entry size in bytes. */
+ private static final int OFFSET_PHENTSIZE = 13;
+
+ /** Number of program headers in ELF. */
+ private static final int OFFSET_PHNUM = 14;
+
+ /** All segment headers entry size in bytes. */
+ private static final int OFFSET_SHENTSIZE = 15;
+
+ /** Number of segment headers in ELF. */
+ private static final int OFFSET_SHNUM = 16;
+
+ /** The section header index that refers to string table. */
+ private static final int OFFSET_SHTRNDX = 17;
+
+ /** Program header offset for type of this program header. */
+ private static final int PHOFF_TYPE = 0;
+
+ /** Program header offset for absolute offset in file. */
+ private static final int PHOFF_OFFSET = 2;
+
+ /** Program header offset for virtual address. */
+ private static final int PHOFF_VADDR = 4;
+
+ /** Program header offset for physical address. */
+ private static final int PHOFF_PADDR = 6;
+
+ /** Program header offset for file size in bytes. */
+ private static final int PHOFF_FILESZ = 8;
+
+ /** Program header offset for memory size in bytes. */
+ private static final int PHOFF_MEMSZ = 10;
+
+ /** Program header offset for flags. */
+ private static final int PHOFF_FLAGS = 12;
+
+ /**
+ * Program header offset for required alignment. 0 or 1 means no alignment
+ * necessary.
+ */
+ private static final int PHOFF_ALIGN = 14;
+
+ /** Index into string pool for segment name. */
+ private static final int SHOFF_NAME = 0;
+
+ /** Segment header type. */
+ private static final int SHOFF_TYPE = 2;
+
+ /** Data is presented in LSB format. */
+ private static final int ELFDATA2LSB = 1;
+
+ /** Date is presented in MSB format. */
+ private static final int ELFDATA2MSB = 2;
+
+ private static final int ELFCLASS32 = 1;
+
+ private static final int ELFCLASS64 = 2;
+
+ private static final long PT_LOAD = 1;
+
+ private RandomAccessFile mFile = null;
+ private final byte[] mBuffer = new byte[512];
+ private int mClass;
+ private int mEndian;
+ private boolean mIsDynamic;
+ private boolean mIsPIE;
+ private int mType;
+ private int mWordSize;
+ private int mHalfWordSize;
+
+ static ReadElf read(File file) throws IOException {
+ return new ReadElf(file);
+ }
+
+ boolean isDynamic() {
+ return mIsDynamic;
+ }
+
+ int getType() {
+ return mType;
+ }
+
+ boolean isPIE() {
+ return mIsPIE;
+ }
+
+ private ReadElf(File file) throws IOException {
+ try {
+ mFile = new RandomAccessFile(file, "r");
+
+ readIdent();
+
+ readHeader();
+ } finally {
+ if (mFile != null) {
+ mFile.close();
+ }
+ }
+ }
+
+ private void readHeader() throws IOException {
+ mType = readHalf(getHeaderOffset(OFFSET_TYPE));
+
+ final long shOffset = readWord(getHeaderOffset(OFFSET_SHOFF));
+ final int shNumber = readHalf(getHeaderOffset(OFFSET_SHNUM));
+ final int shSize = readHalf(getHeaderOffset(OFFSET_SHENTSIZE));
+
+ readSectionHeaders(shOffset, shNumber, shSize);
+
+ final long phOffset = readWord(getHeaderOffset(OFFSET_PHOFF));
+ final int phNumber = readHalf(getHeaderOffset(OFFSET_PHNUM));
+ final int phSize = readHalf(getHeaderOffset(OFFSET_PHENTSIZE));
+
+ readProgramHeaders(phOffset, phNumber, phSize);
+ }
+
+ private void readSectionHeaders(long shOffset, int shNumber, int shSize) throws IOException {
+ for (int i = 0; i < shNumber; i++) {
+ final long type = readWord(shOffset + i * shSize + mHalfWordSize * SHOFF_TYPE);
+ if (type == 6) {
+ mIsDynamic = true;
+ }
+ }
+ }
+
+ private void readProgramHeaders(long phOffset, int phNumber, int phSize) throws IOException {
+ for (int i = 0; i < phNumber; i++) {
+ final long baseOffset = phOffset + i * phSize;
+ final long type = readWord(baseOffset);
+ if (type == PT_LOAD) {
+ final long virtAddress = readWord(baseOffset + mHalfWordSize * PHOFF_VADDR);
+ if (virtAddress == 0) {
+ mIsPIE = true;
+ }
+ }
+ }
+ }
+
+ private int getHeaderOffset(int halfWorldOffset) {
+ return EI_NIDENT + halfWorldOffset * mHalfWordSize;
+ }
+
+ private int readHalf(long offset) throws IOException {
+ mFile.seek(offset);
+ mFile.readFully(mBuffer, 0, mWordSize);
+
+ final int answer;
+ if (mEndian == ELFDATA2LSB) {
+ answer = mBuffer[1] << 8 | mBuffer[0];
+ } else {
+ answer = mBuffer[0] << 8 | mBuffer[1];
+ }
+
+ return answer;
+ }
+
+ private long readWord(long offset) throws IOException {
+ mFile.seek(offset);
+ mFile.readFully(mBuffer, 0, mWordSize);
+
+ int answer = 0;
+ if (mEndian == ELFDATA2LSB) {
+ for (int i = mWordSize - 1; i >= 0; i--) {
+ answer = (answer << 8) | (mBuffer[i] & 0xFF);
+ }
+ } else {
+ final int N = mWordSize - 1;
+ for (int i = 0; i <= N; i++) {
+ answer = (answer << 8) | mBuffer[i];
+ }
+ }
+
+ return answer;
+ }
+
+ private void readIdent() throws IOException {
+ mFile.seek(0);
+ mFile.readFully(mBuffer, 0, EI_NIDENT);
+
+ if (mBuffer[0] != ELF_IDENT[0] || mBuffer[1] != ELF_IDENT[1] || mBuffer[2] != ELF_IDENT[2]
+ || mBuffer[3] != ELF_IDENT[3]) {
+ throw new IllegalArgumentException("Invalid ELF file");
+ }
+
+ mClass = mBuffer[4];
+ if (mClass == ELFCLASS32) {
+ mWordSize = 4;
+ mHalfWordSize = 2;
+ } else {
+ throw new IOException("Invalid executable type " + mClass + ": not ELFCLASS32!");
+ }
+
+ mEndian = mBuffer[5];
+ }
+}
diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index ab14f12..702361d 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -69,18 +69,14 @@
int pid = findVold();
StorageManager sm = (StorageManager) getContext().getSystemService(Context.STORAGE_SERVICE);
- try {
- sm.getMountedObbPath("AAAA AAAA AAAA AAAA "
- + "AAAA AAAA AAAA AAAA "
- + "AAAA AAAA AAAA AAAA "
- + "AAAA AAAA AAAA AAAA"
- + "AAAA AAAA AAAA AAAA"
- + "AAAA AAAA AAAA AAAA"
- + "AAAA AAAA AAAA AAAA"
- + "AAAA AAAA AAAA AAAA");
- } catch (IllegalStateException e) {
- // expected
- }
+ sm.getMountedObbPath("AAAA AAAA AAAA AAAA "
+ + "AAAA AAAA AAAA AAAA "
+ + "AAAA AAAA AAAA AAAA "
+ + "AAAA AAAA AAAA AAAA"
+ + "AAAA AAAA AAAA AAAA"
+ + "AAAA AAAA AAAA AAAA"
+ + "AAAA AAAA AAAA AAAA"
+ + "AAAA AAAA AAAA AAAA");
Thread.sleep(2000); // give vold some time to crash
diff --git a/tests/tests/speech/Android.mk b/tests/tests/speech/Android.mk
index 932c564..225acf3 100755
--- a/tests/tests/speech/Android.mk
+++ b/tests/tests/speech/Android.mk
@@ -31,5 +31,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/telephony/Android.mk b/tests/tests/telephony/Android.mk
index 6ccc9b3..de5c2ac 100644
--- a/tests/tests/telephony/Android.mk
+++ b/tests/tests/telephony/Android.mk
@@ -33,5 +33,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
# #LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/telephony/src/android/telephony/cts/PhoneNumberFormattingTextWatcherTest.java b/tests/tests/telephony/src/android/telephony/cts/PhoneNumberFormattingTextWatcherTest.java
deleted file mode 100644
index b96dcd9..0000000
--- a/tests/tests/telephony/src/android/telephony/cts/PhoneNumberFormattingTextWatcherTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.telephony.cts;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.telephony.PhoneNumberFormattingTextWatcher;
-import android.test.AndroidTestCase;
-import android.text.Editable;
-import android.widget.TextView;
-
-@TestTargetClass(PhoneNumberFormattingTextWatcher.class)
-public class PhoneNumberFormattingTextWatcherTest extends AndroidTestCase {
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "PhoneNumberFormattingTextWatcher",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.SUFFICIENT,
- method = "beforeTextChanged",
- args = {java.lang.CharSequence.class, int.class, int.class, int.class}
- ),
- @TestTargetNew(
- level = TestLevel.SUFFICIENT,
- method = "afterTextChanged",
- args = {android.text.Editable.class}
- ),
- @TestTargetNew(
- level = TestLevel.SUFFICIENT,
- method = "onTextChanged",
- args = {java.lang.CharSequence.class, int.class, int.class, int.class}
- )
- })
- public void testPhoneNumberFormattingTextWatcher() {
- TextView text = new TextView(getContext());
- text.addTextChangedListener(new PhoneNumberFormattingTextWatcher());
-
- text.setText("+15551212");
- assertEquals("+1-555-1212", text.getText().toString());
-
- // delete first dash and first 5
- Editable edit = (Editable) text.getText();
- edit.delete(2, 3);
- assertEquals("+1-551-212", text.getText().toString());
-
- // already formatted correctly
- text.setText("+1-555-1212");
- assertEquals("+1-555-1212", text.getText().toString());
- }
-}
diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index 5c44027..1ffeee9 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
index 6dde08d..087b930 100755
--- a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
@@ -22,6 +22,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.provider.Settings.SettingNotFoundException;
import android.provider.Settings.System;
@@ -30,7 +31,6 @@
import android.text.method.PasswordTransformationMethod;
import android.view.KeyCharacterMap;
import android.view.View;
-import android.view.animation.cts.DelayedCheck;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
@@ -175,7 +175,7 @@
assertTrue(mMethod.hasCalledAfterTextChanged());
// it will get transformed after a while
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
// "******"
diff --git a/tests/tests/theme/Android.mk b/tests/tests/theme/Android.mk
new file mode 100644
index 0000000..95f55fb
--- /dev/null
+++ b/tests/tests/theme/Android.mk
@@ -0,0 +1,34 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsThemeTestCases
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# All tests should include android.test.runner.
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/theme/AndroidManifest.xml b/tests/tests/theme/AndroidManifest.xml
new file mode 100644
index 0000000..f41183a
--- /dev/null
+++ b/tests/tests/theme/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.theme">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ <activity android:name="android.theme.cts.DeviceDefaultActivity" />
+ </application>
+
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.cts.theme"
+ android:label="CTS tests for themes"/>
+</manifest>
+
diff --git a/tests/tests/theme/res/layout/empty.xml b/tests/tests/theme/res/layout/empty.xml
new file mode 100644
index 0000000..f6047ac
--- /dev/null
+++ b/tests/tests/theme/res/layout/empty.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ />
diff --git a/tests/tests/theme/src/android/theme/cts/DeviceDefaultActivity.java b/tests/tests/theme/src/android/theme/cts/DeviceDefaultActivity.java
new file mode 100644
index 0000000..139a48f
--- /dev/null
+++ b/tests/tests/theme/src/android/theme/cts/DeviceDefaultActivity.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.theme.cts;
+
+import com.android.cts.theme.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
+
+public class DeviceDefaultActivity extends Activity {
+
+ public static final String EXTRA_THEME_ID = "themeId";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Window window = getWindow();
+ window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+
+ int themeId = getIntent().getIntExtra(EXTRA_THEME_ID, -1);
+ setTheme(themeId);
+
+ setContentView(R.layout.empty);
+ }
+}
diff --git a/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java b/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java
new file mode 100644
index 0000000..086dce1
--- /dev/null
+++ b/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.theme.cts;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.test.ActivityInstrumentationTestCase2;
+
+public class DeviceDefaultTest extends ActivityInstrumentationTestCase2<DeviceDefaultActivity> {
+
+ public DeviceDefaultTest() {
+ super(DeviceDefaultActivity.class);
+ }
+
+ public void testGetActionBar_DeviceDefault() {
+ assertActionBar(android.R.style.Theme_DeviceDefault);
+ }
+
+ public void testGetActionBar_DeviceDefault_Dialog() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Dialog);
+ }
+
+ public void testGetActionBar_DeviceDefault_MinWidth() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Dialog_MinWidth);
+ }
+
+ public void testGetActionBar_DeviceDefault_Dialog_NoActionBar() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
+ }
+
+ public void testGetActionBar_DeviceDefault_Dialog_NoActionBar_MinWidth() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Dialog_NoActionBar_MinWidth);
+ }
+
+ public void testGetActionBar_DeviceDefault_DialogWhenLarge() {
+ assertActionBarWhenLarge(android.R.style.Theme_DeviceDefault_DialogWhenLarge);
+ }
+
+ public void testGetActionBar_DeviceDefault_DialogWhenLarge_NoActionBar() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_DialogWhenLarge_NoActionBar);
+ }
+
+ public void testGetActionBar_DeviceDefault_InputMethod() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_InputMethod);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light() {
+ assertActionBar(android.R.style.Theme_DeviceDefault_Light);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_DarkActionBar() {
+ assertActionBar(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_Dialog() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_Dialog);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_Dialog_MinWidth() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_Dialog_MinWidth);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_Dialog_NoActionBar() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_Dialog_NoActionBar);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_Dialog_NoActionBar_MinWidth() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_DialogWhenLarge() {
+ assertActionBarWhenLarge(android.R.style.Theme_Holo_Light_DialogWhenLarge);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_DialogWhenLarge_NoActionBar() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_NoActionBar() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_NoActionBar);
+ }
+
+ public void testGetActionBar_DeviceDefault_Light_NoActionBar_Fullscreen() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Light_NoActionBar_Fullscreen);
+ }
+
+ public void testGetActionBar_DeviceDefault_Panel() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Panel);
+ }
+
+ public void testGetActionBar_DeviceDefault_Wallpaper() {
+ assertActionBar(android.R.style.Theme_DeviceDefault_Wallpaper);
+ }
+
+ public void testGetActionBar_DeviceDefault_Wallpaper_NoTitleBar() {
+ assertNoActionBar(android.R.style.Theme_DeviceDefault_Wallpaper_NoTitleBar);
+ }
+
+ private void assertActionBar(int themeId) {
+ assertGetActionBar(themeId, true);
+ }
+
+ private void assertNoActionBar(int themeId) {
+ assertGetActionBar(themeId, false);
+ }
+
+ private void assertGetActionBar(int themeId, boolean actionBar) {
+ Activity activity = startActivity(themeId);
+ if (actionBar) {
+ assertNotNull(activity.getActionBar());
+ } else {
+ assertNull(activity.getActionBar());
+ }
+ }
+
+ private void assertActionBarWhenLarge(int themeId) {
+ Activity activity = startActivity(themeId);
+ if (isLargeScreen(activity)) {
+ // Large screens will have dialogs which don't have action bars...
+ assertNoActionBar(themeId);
+ } else {
+ assertActionBar(themeId);
+ }
+ }
+
+ private boolean isLargeScreen(Context context) {
+ Configuration config = context.getResources().getConfiguration();
+ int size = config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+ return config.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+ }
+
+ private Activity startActivity(int themeId) {
+ setActivityIntent(new Intent().putExtra(DeviceDefaultActivity.EXTRA_THEME_ID, themeId));
+ return getActivity();
+ }
+}
diff --git a/tests/tests/util/Android.mk b/tests/tests/util/Android.mk
index cc65d12..d66e5e4 100644
--- a/tests/tests/util/Android.mk
+++ b/tests/tests/util/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index 037ae9a..4d82d91 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk
@@ -29,5 +29,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
index 6343da6..447ec84 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
@@ -26,6 +26,7 @@
import android.app.Activity;
import android.content.res.XmlResourceParser;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.util.AttributeSet;
import android.util.Xml;
@@ -355,7 +356,7 @@
// test repeat mode REVERSE
anim.setRepeatCount(1);
anim.setRepeatMode(Animation.REVERSE);
- // we have to DelayedCheck the animation status on test thread,
+ // we have to PollingCheck the animation status on test thread,
// it cannot be done on UI thread, so we invoke runOnMainSync method here.
getInstrumentation().runOnMainSync(new Runnable() {
public void run() {
@@ -364,7 +365,7 @@
});
// check whether animation has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return anim.hasStarted();
@@ -386,7 +387,7 @@
// wait for animation has ended.
// timeout is larger than duration, in case the system is sluggish
- new DelayedCheck(duration * 2 + 1000) {
+ new PollingCheck(duration * 2 + 1000) {
@Override
protected boolean check() {
return anim.hasEnded();
@@ -414,7 +415,7 @@
// test repeat mode RESTART
anim.setRepeatMode(Animation.RESTART);
- // we have to DelayedCheck the animation status on test thread,
+ // we have to PollingCheck the animation status on test thread,
// it cannot be done on UI thread, so we invoke runOnMainSync method here.
getInstrumentation().runOnMainSync(new Runnable() {
public void run() {
@@ -423,7 +424,7 @@
});
// check whether animation has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return anim.hasStarted();
@@ -445,7 +446,7 @@
// wait for animation has ended.
// timeout is larger than duration, in case the system is sluggish
- new DelayedCheck(duration * 2 + 1000) {
+ new PollingCheck(duration * 2 + 1000) {
@Override
protected boolean check() {
return anim.hasEnded();
@@ -627,7 +628,7 @@
final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
assertFalse(anim.hasStarted());
- // we have to DelayedCheck the animation status on test thread,
+ // we have to PollingCheck the animation status on test thread,
// it cannot be done on UI thread, so we invoke runOnMainSync method here.
getInstrumentation().runOnMainSync(new Runnable() {
public void run() {
@@ -636,7 +637,7 @@
});
// check whether animation has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return anim.hasStarted();
@@ -662,7 +663,7 @@
// wait for animation has ended.
// timeout is larger than duration, in case the system is sluggish
- new DelayedCheck(2000) {
+ new PollingCheck(2000) {
@Override
protected boolean check() {
return anim.hasEnded();
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index be60976..aee9075 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -29,6 +29,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.Point;
import android.graphics.Rect;
@@ -69,7 +70,6 @@
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
-import android.view.animation.cts.DelayedCheck;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
@@ -287,7 +287,7 @@
assertTrue(view.hasCalledOnAnimationStart());
// check whether it has ended after duration, and alpha changed during this time.
- new DelayedCheck(duration + TIMEOUT_DELTA) {
+ new PollingCheck(duration + TIMEOUT_DELTA) {
@Override
protected boolean check() {
return view.hasCalledOnSetAlpha() && view.hasCalledOnAnimationEnd();
@@ -2257,7 +2257,7 @@
// mAttachInfo is not null
final View view2 = mActivity.findViewById(R.id.fit_windows);
// Wait until the window has been focused.
- new DelayedCheck(TIMEOUT_DELTA) {
+ new PollingCheck(TIMEOUT_DELTA) {
@Override
protected boolean check() {
return view2.hasWindowFocus();
@@ -4429,7 +4429,7 @@
viewGroup.addView(editText);
editText.requestFocus();
- new DelayedCheck(TIMEOUT_DELTA) {
+ new PollingCheck(TIMEOUT_DELTA) {
@Override
protected boolean check() {
return editText.isFocused();
diff --git a/tests/tests/view/src/android/view/cts/View_AnimationTest.java b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
index 144e670..d2085c6 100644
--- a/tests/tests/view/src/android/view/cts/View_AnimationTest.java
+++ b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
@@ -17,12 +17,12 @@
package android.view.cts;
import android.app.Activity;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.TranslateAnimation;
import android.view.animation.cts.AnimationTestUtils;
-import android.view.animation.cts.DelayedCheck;
import com.android.cts.stub.R;
@@ -155,7 +155,7 @@
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mAnimation.hasStarted();
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
index 2cf6b58..1556cc3 100755
--- a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
@@ -25,6 +25,7 @@
import android.app.Instrumentation;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.os.Bundle;
import android.test.ActivityInstrumentationTestCase2;
import android.text.Editable;
@@ -35,7 +36,6 @@
import android.view.KeyEvent;
import android.view.View;
import android.view.Window;
-import android.view.animation.cts.DelayedCheck;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.ExtractedTextRequest;
@@ -260,7 +260,7 @@
// dummy mode
BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
dummyConnection.commitText(inputText, inputText.length());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return text2.toString().equals(mView.getText().toString());
@@ -323,7 +323,7 @@
BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
dummyConnection.setComposingText(str, str.length());
dummyConnection.finishComposingText();
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return text.toString().equals(mView.getText().toString());
@@ -359,7 +359,7 @@
mInstrumentation.sendStringSync("q");
mInstrumentation.waitForIdleSync();
}
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return "q".equals(mView.getText().toString());
diff --git a/tests/tests/webkit/Android.mk b/tests/tests/webkit/Android.mk
index f739b42..1426dbb 100644
--- a/tests/tests/webkit/Android.mk
+++ b/tests/tests/webkit/Android.mk
@@ -32,5 +32,4 @@
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
index bebb1fa..5affa09 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
@@ -16,27 +16,26 @@
package android.webkit.cts;
+import android.cts.util.PollingCheck;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.CacheManager;
+import android.webkit.CacheManager.CacheResult;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.CacheManager;
-import android.webkit.WebView;
-import android.webkit.CacheManager.CacheResult;
-
import java.util.Map;
@TestTargetClass(android.webkit.CacheManager.class)
public class CacheManagerTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
- private static final long CACHEMANAGER_INIT_TIMEOUT = 5000l;
- private static final long NETWORK_OPERATION_DELAY = 10000l;
+ private static final long CACHEMANAGER_INIT_TIMEOUT = 5000L;
+ private static final long NETWORK_OPERATION_TIMEOUT = 10000L;
- private WebView mWebView;
private CtsTestServer mWebServer;
+ private WebViewOnUiThread mOnUiThread;
public CacheManagerTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
@@ -45,7 +44,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
}
@Override
@@ -98,15 +97,15 @@
final String url = mWebServer.getAssetUrl(TestHtmlConstants.EMBEDDED_IMG_URL);
// Wait for CacheManager#init() finish.
- new DelayedCheck(CACHEMANAGER_INIT_TIMEOUT) {
+ new PollingCheck(CACHEMANAGER_INIT_TIMEOUT) {
@Override
protected boolean check() {
return CacheManager.getCacheFileBaseDir() != null;
}
}.run();
- mWebView.clearCache(true);
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ mOnUiThread.clearCache(true);
+ new PollingCheck(NETWORK_OPERATION_TIMEOUT) {
@Override
protected boolean check() {
CacheResult result = CacheManager.getCacheFile(url, null);
@@ -114,8 +113,8 @@
}
}.run();
- loadUrl(url);
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ new PollingCheck(NETWORK_OPERATION_TIMEOUT) {
@Override
protected boolean check() {
CacheResult result = CacheManager.getCacheFile(url, null);
@@ -137,16 +136,4 @@
// The cache should always be enabled.
assertFalse(CacheManager.cacheDisabled());
}
-
- private void loadUrl(String url){
- mWebView.loadUrl(url);
- // check whether loadURL successfully
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
- @Override
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- assertEquals(100, mWebView.getProgress());
- }
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java b/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java
index 48a6a1f..b75c31e 100755
--- a/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java
@@ -16,6 +16,12 @@
package android.webkit.cts;
+import android.cts.util.PollingCheck;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.CacheManager;
+import android.webkit.CacheManager.CacheResult;
+import android.webkit.WebView;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
@@ -24,23 +30,16 @@
import org.apache.http.HttpStatus;
import org.apache.http.impl.cookie.DateUtils;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.CacheManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.CacheManager.CacheResult;
-
import java.io.File;
import java.io.InputStream;
@TestTargetClass(android.webkit.CacheManager.CacheResult.class)
public class CacheManager_CacheResultTest
extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
- private static final long NETWORK_OPERATION_DELAY = 10000l;
+ private static final long NETWORK_OPERATION_TIMEOUT = 10000L;
- private WebView mWebView;
private CtsTestServer mWebServer;
+ private WebViewOnUiThread mOnUiThread;
public CacheManager_CacheResultTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
@@ -49,8 +48,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
- mWebView.setWebChromeClient(new WebChromeClient());
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
}
@Override
@@ -138,8 +136,8 @@
mWebServer.setDocumentAge(age);
mWebServer.setDocumentValidity(validity);
- mWebView.clearCache(true);
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ mOnUiThread.clearCache(true);
+ new PollingCheck(NETWORK_OPERATION_TIMEOUT) {
@Override
protected boolean check() {
CacheResult result =
@@ -148,7 +146,7 @@
}
}.run();
final long time = System.currentTimeMillis();
- loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
CacheResult result = CacheManager.getCacheFile(url, null);
assertNotNull(result);
assertNotNull(result.getInputStream());
@@ -171,16 +169,4 @@
result.setInputStream(null);
assertNull(result.getInputStream());
}
-
- private void loadUrl(String url){
- mWebView.loadUrl(url);
- // check whether loadURL successfully
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
- @Override
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- assertEquals(100, mWebView.getProgress());
- }
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
index 712d641..f9446c8 100755
--- a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
@@ -16,19 +16,18 @@
package android.webkit.cts;
+import android.cts.util.PollingCheck;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
+import android.webkit.WebView;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -37,9 +36,9 @@
public class CookieManagerTest extends
ActivityInstrumentationTestCase2<CookieSyncManagerStubActivity> {
- private static final int TEST_DELAY = 5000;
+ private static final int TEST_TIMEOUT = 5000;
- private WebView mWebView;
+ private WebViewOnUiThread mOnUiThread;
private CookieManager mCookieManager;
public CookieManagerTest() {
@@ -49,10 +48,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
-
- // Set a web chrome client in order to receive progress updates.
- mWebView.setWebChromeClient(new WebChromeClient());
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
mCookieManager = CookieManager.getInstance();
assertNotNull(mCookieManager);
@@ -114,17 +110,17 @@
CtsTestServer server = new CtsTestServer(getActivity(), false);
String url = server.getCookieUrl("conquest.html");
- loadUrl(url);
- assertEquals(null, mWebView.getTitle()); // no cookies passed
- Thread.sleep(TEST_DELAY);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(null, mOnUiThread.getTitle()); // no cookies passed
+ Thread.sleep(500);
assertNull(mCookieManager.getCookie(url));
mCookieManager.setAcceptCookie(true);
assertTrue(mCookieManager.acceptCookie());
url = server.getCookieUrl("war.html");
- loadUrl(url);
- assertEquals(null, mWebView.getTitle()); // no cookies passed
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(null, mOnUiThread.getTitle()); // no cookies passed
waitForCookie(url);
String cookie = mCookieManager.getCookie(url);
assertNotNull(cookie);
@@ -135,8 +131,8 @@
assertEquals("0", m.group(1));
url = server.getCookieUrl("famine.html");
- loadUrl(url);
- assertEquals("count=0", mWebView.getTitle()); // outgoing cookie
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals("count=0", mOnUiThread.getTitle()); // outgoing cookie
waitForCookie(url);
cookie = mCookieManager.getCookie(url);
assertNotNull(cookie);
@@ -146,8 +142,8 @@
url = server.getCookieUrl("death.html");
mCookieManager.setCookie(url, "count=41");
- loadUrl(url);
- assertEquals("count=41", mWebView.getTitle()); // outgoing cookie
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals("count=41", mOnUiThread.getTitle()); // outgoing cookie
waitForCookie(url);
cookie = mCookieManager.getCookie(url);
assertNotNull(cookie);
@@ -187,7 +183,7 @@
// sync cookie from RAM to FLASH, because hasCookies() only counts FLASH cookies
CookieSyncManager.getInstance().sync();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return mCookieManager.hasCookies();
@@ -196,7 +192,7 @@
// clean up all cookies
mCookieManager.removeAllCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return !mCookieManager.hasCookies();
@@ -247,7 +243,8 @@
assertTrue(allCookies.contains(cookie3));
mCookieManager.removeSessionCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
String c = mCookieManager.getCookie(url);
return !c.contains(cookie1) && c.contains(cookie2) && c.contains(cookie3);
@@ -256,7 +253,8 @@
Thread.sleep(expiration + 1000); // wait for cookie to expire
mCookieManager.removeExpiredCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
String c = mCookieManager.getCookie(url);
return !c.contains(cookie1) && c.contains(cookie2) && !c.contains(cookie3);
@@ -264,24 +262,17 @@
}.run();
mCookieManager.removeAllCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return mCookieManager.getCookie(url) == null;
}
}.run();
}
- private void loadUrl(String url) {
- mWebView.loadUrl(url);
- new DelayedCheck(TEST_DELAY) {
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- }
-
private void waitForCookie(final String url) {
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return mCookieManager.getCookie(url) != null;
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java
index 9450c70..8093a10 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java
@@ -22,8 +22,8 @@
import dalvik.annotation.TestTargets;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
@@ -31,6 +31,8 @@
public class CookieSyncManagerTest
extends ActivityInstrumentationTestCase2<CookieSyncManagerStubActivity> {
+ private final static int COOKIE_MANAGER_TIMEOUT = 5000;
+
public CookieSyncManagerTest() {
super("com.android.cts.stub", CookieSyncManagerStubActivity.class);
}
@@ -65,7 +67,7 @@
// Remove all cookies from the database.
cookieManager.removeAllCookie();
- new DelayedCheck(30000) {
+ new PollingCheck(COOKIE_MANAGER_TIMEOUT) {
@Override
protected boolean check() {
return !cookieManager.hasCookies();
@@ -83,7 +85,7 @@
// Store the cookie to the database.
csm1.sync();
- new DelayedCheck(30000) {
+ new PollingCheck(COOKIE_MANAGER_TIMEOUT) {
@Override
protected boolean check() {
return cookieManager.hasCookies();
@@ -92,7 +94,7 @@
// Remove all cookies from the database.
cookieManager.removeAllCookie();
- new DelayedCheck(30000) {
+ new PollingCheck(COOKIE_MANAGER_TIMEOUT) {
@Override
protected boolean check() {
return !cookieManager.hasCookies();
diff --git a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
index 8721326..9a54ace 100644
--- a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
@@ -16,6 +16,11 @@
package android.webkit.cts;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.HttpAuthHandler;
+import android.webkit.WebView;
+import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
@@ -23,20 +28,13 @@
import org.apache.http.HttpStatus;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.HttpAuthHandler;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
@TestTargetClass(android.webkit.HttpAuthHandler.class)
public class HttpAuthHandlerTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
private static final long TIMEOUT = 10000;
- private WebView mWebView;
private CtsTestServer mWebServer;
+ private WebViewOnUiThread mOnUiThread;
public HttpAuthHandlerTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
@@ -45,16 +43,13 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
-
- // Set a web chrome client in order to receive progress updates.
- mWebView.setWebChromeClient(new WebChromeClient());
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
}
@Override
protected void tearDown() throws Exception {
- mWebView.clearHistory();
- mWebView.clearCache(true);
+ mOnUiThread.clearHistory();
+ mOnUiThread.clearCache(true);
if (mWebServer != null) {
mWebServer.shutdown();
}
@@ -86,30 +81,30 @@
// wrong credentials
MyWebViewClient client = new MyWebViewClient(true, "FakeUser", "FakePass");
- mWebView.setWebViewClient(client);
+ mOnUiThread.setWebViewClient(client);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals(CtsTestServer.AUTH_REALM, client.realm);
- assertEquals(CtsTestServer.getReasonString(HttpStatus.SC_UNAUTHORIZED), mWebView.getTitle());
+ assertEquals(CtsTestServer.getReasonString(HttpStatus.SC_UNAUTHORIZED), mOnUiThread.getTitle());
assertTrue(client.useHttpAuthUsernamePassword);
// missing credentials
client = new MyWebViewClient(true, null, null);
- mWebView.setWebViewClient(client);
+ mOnUiThread.setWebViewClient(client);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals(CtsTestServer.AUTH_REALM, client.realm);
assertEquals(
- CtsTestServer.getReasonString(HttpStatus.SC_UNAUTHORIZED), mWebView.getTitle());
+ CtsTestServer.getReasonString(HttpStatus.SC_UNAUTHORIZED), mOnUiThread.getTitle());
assertTrue(client.useHttpAuthUsernamePassword);
// correct credentials
client = new MyWebViewClient(true, CtsTestServer.AUTH_USER, CtsTestServer.AUTH_PASS);
- mWebView.setWebViewClient(client);
+ mOnUiThread.setWebViewClient(client);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals(CtsTestServer.AUTH_REALM, client.realm);
- assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mWebView.getTitle());
+ assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mOnUiThread.getTitle());
assertTrue(client.useHttpAuthUsernamePassword);
}
@@ -123,25 +118,15 @@
String url = mWebServer.getAuthAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
MyWebViewClient client = new MyWebViewClient(false, null, null);
- mWebView.setWebViewClient(client);
+ mOnUiThread.setWebViewClient(client);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals(CtsTestServer.AUTH_REALM, client.realm);
assertEquals(
- CtsTestServer.getReasonString(HttpStatus.SC_UNAUTHORIZED), mWebView.getTitle());
+ CtsTestServer.getReasonString(HttpStatus.SC_UNAUTHORIZED), mOnUiThread.getTitle());
}
- private void assertLoadUrlSuccessfully(String url) throws InterruptedException {
- mWebView.loadUrl(url);
- new DelayedCheck(TIMEOUT) {
- @Override
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- }
-
- private static class MyWebViewClient extends WebViewClient {
+ private class MyWebViewClient extends WaitForLoadedClient {
String realm;
boolean useHttpAuthUsernamePassword;
@@ -151,11 +136,13 @@
private int mAuthCount;
MyWebViewClient(boolean proceed, String user, String password) {
+ super(mOnUiThread);
mProceed = proceed;
mUser = user;
mPassword = password;
}
+ @Override
public void onReceivedHttpAuthRequest(WebView view,
HttpAuthHandler handler, String host, String realm) {
++mAuthCount;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
index 6cddfb3..f18aa4c 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
@@ -16,28 +16,32 @@
package android.webkit.cts;
+import android.cts.util.PollingCheck;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.WebBackForwardList;
+import android.webkit.WebHistoryItem;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.WebBackForwardList;
-import android.webkit.WebHistoryItem;
-import android.webkit.WebView;
-
@TestTargetClass(WebBackForwardList.class)
public class WebBackForwardListTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
private static final int TEST_TIMEOUT = 10000;
- private WebView mWebView;
+ private WebViewOnUiThread mOnUiThread;
public WebBackForwardListTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
}
+ @Override
+ public void setUp() {
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
+ }
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -61,8 +65,7 @@
)
})
public void testGetCurrentItem() throws Exception {
- mWebView = getActivity().getWebView();
- WebBackForwardList list = mWebView.copyBackForwardList();
+ WebBackForwardList list = mOnUiThread.copyBackForwardList();
assertNull(list.getCurrentItem());
assertEquals(0, list.getSize());
@@ -76,26 +79,27 @@
String url2 = server.getAssetUrl(TestHtmlConstants.HTML_URL2);
String url3 = server.getAssetUrl(TestHtmlConstants.HTML_URL3);
- mWebView.loadUrl(url1);
- checkBackForwardList(mWebView, url1);
+ mOnUiThread.loadUrlAndWaitForCompletion(url1);
+ checkBackForwardList(url1);
- mWebView.loadUrl(url2);
- checkBackForwardList(mWebView, url1, url2);
+ mOnUiThread.loadUrlAndWaitForCompletion(url2);
+ checkBackForwardList(url1, url2);
- mWebView.loadUrl(url3);
- checkBackForwardList(mWebView, url1, url2, url3);
+ mOnUiThread.loadUrlAndWaitForCompletion(url3);
+ checkBackForwardList(url1, url2, url3);
} finally {
server.shutdown();
}
}
- private void checkBackForwardList(final WebView view, final String... url) {
- new DelayedCheck(TEST_TIMEOUT) {
+ private void checkBackForwardList(final String... url) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
- if (view.getProgress() < 100) {
+ if (mOnUiThread.getProgress() < 100) {
return false;
}
- WebBackForwardList list = view.copyBackForwardList();
+ WebBackForwardList list = mOnUiThread.copyBackForwardList();
if (list.getSize() != url.length) {
return false;
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index cf20217..c0a597b 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -16,29 +16,29 @@
package android.webkit.cts;
+import android.cts.util.PollingCheck;
+import android.graphics.Bitmap;
+import android.os.Message;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.JsPromptResult;
+import android.webkit.JsResult;
+import android.webkit.WebIconDatabase;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.graphics.Bitmap;
-import android.os.Message;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
-import android.webkit.WebIconDatabase;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-
@TestTargetClass(android.webkit.WebChromeClient.class)
public class WebChromeClientTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
private static final long TEST_TIMEOUT = 5000L;
- private WebView mWebView;
private CtsTestServer mWebServer;
private WebIconDatabase mIconDb;
+ private WebViewOnUiThread mOnUiThread;
public WebChromeClientTest() {
super(WebViewStubActivity.class);
@@ -47,14 +47,14 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
mWebServer = new CtsTestServer(getActivity());
}
@Override
protected void tearDown() throws Exception {
- mWebView.clearHistory();
- mWebView.clearCache(true);
+ mOnUiThread.clearHistory();
+ mOnUiThread.clearCache(true);
if (mWebServer != null) {
mWebServer.shutdown();
}
@@ -74,12 +74,12 @@
})
public void testOnProgressChanged() {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
assertFalse(webChromeClient.hadOnProgressChanged());
- mWebView.loadUrl(TestHtmlConstants.HELLO_WORLD_URL);
+ mOnUiThread.loadUrlAndWaitForCompletion(TestHtmlConstants.HELLO_WORLD_URL);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnProgressChanged();
@@ -96,13 +96,13 @@
})
public void testOnReceivedTitle() throws Exception {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
assertFalse(webChromeClient.hadOnReceivedTitle());
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- mWebView.loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnReceivedTitle();
@@ -121,7 +121,7 @@
})
public void testOnReceivedIcon() throws Throwable {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
runTestOnUiThread(new Runnable() {
@@ -138,9 +138,9 @@
assertFalse(webChromeClient.hadOnReceivedIcon());
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- mWebView.loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnReceivedIcon();
@@ -167,9 +167,9 @@
})
public void testWindows() throws Exception {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
- final WebSettings settings = mWebView.getSettings();
+ final WebSettings settings = mOnUiThread.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
settings.setSupportMultipleWindows(true);
@@ -178,16 +178,17 @@
// load a page that opens a child window, requests focus for the child and sets a timeout
// after which the child will be closed
- loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.JS_WINDOW_URL));
+ mOnUiThread.loadUrlAndWaitForCompletion(mWebServer.
+ getAssetUrl(TestHtmlConstants.JS_WINDOW_URL));
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnCreateWindow();
}
}.run();
assertFalse(webChromeClient.hadOnRequestFocus());
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnCloseWindow();
@@ -204,19 +205,19 @@
})
public void testOnJsBeforeUnload() throws Exception {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
- final WebSettings settings = mWebView.getSettings();
+ final WebSettings settings = mOnUiThread.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
assertFalse(webChromeClient.hadOnJsBeforeUnload());
- loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.JS_UNLOAD_URL));
+ mOnUiThread.loadUrlAndWaitForCompletion(mWebServer.getAssetUrl(TestHtmlConstants.JS_UNLOAD_URL));
// unload should trigger when we try to navigate away
- loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL));
+ mOnUiThread.loadUrlAndWaitForCompletion(mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL));
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsBeforeUnload();
@@ -234,18 +235,18 @@
})
public void testOnJsAlert() throws Exception {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
- final WebSettings settings = mWebView.getSettings();
+ final WebSettings settings = mOnUiThread.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
assertFalse(webChromeClient.hadOnJsAlert());
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_ALERT_URL);
- mWebView.loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsAlert();
@@ -263,18 +264,18 @@
})
public void testOnJsConfirm() throws Exception {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
- final WebSettings settings = mWebView.getSettings();
+ final WebSettings settings = mOnUiThread.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
assertFalse(webChromeClient.hadOnJsConfirm());
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_CONFIRM_URL);
- mWebView.loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsConfirm();
@@ -292,9 +293,9 @@
})
public void testOnJsPrompt() throws Exception {
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- mWebView.setWebChromeClient(webChromeClient);
+ mOnUiThread.setWebChromeClient(webChromeClient);
- final WebSettings settings = mWebView.getSettings();
+ final WebSettings settings = mOnUiThread.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
@@ -303,33 +304,25 @@
final String promptResult = "CTS";
webChromeClient.setPromptResult(promptResult);
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_PROMPT_URL);
- mWebView.loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsPrompt();
}
}.run();
// the result returned by the client gets set as the page title
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
- return mWebView.getTitle().equals(promptResult);
+ return mOnUiThread.getTitle().equals(promptResult);
}
}.run();
assertEquals(webChromeClient.getMessage(), "testOnJsPrompt");
}
- private void loadUrl(String url) {
- mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- }
-
- private class MockWebChromeClient extends WebChromeClient {
+ private class MockWebChromeClient extends WaitForProgressClient {
private boolean mHadOnProgressChanged;
private boolean mHadOnReceivedTitle;
private String mPageTitle;
@@ -344,6 +337,10 @@
private boolean mHadOnRequestFocus;
private boolean mHadOnReceivedIcon;
+ public MockWebChromeClient() {
+ super(mOnUiThread);
+ }
+
public void setPromptResult(String promptResult) {
mPromptResult = promptResult;
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
index 71ba504..55ec6de 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
@@ -16,25 +16,21 @@
package android.webkit.cts;
-import dalvik.annotation.BrokenTest;
+import android.graphics.Bitmap;
+import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.WebBackForwardList;
+import android.webkit.WebHistoryItem;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
-
-import android.graphics.Bitmap;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.WebBackForwardList;
-import android.webkit.WebChromeClient;
-import android.webkit.WebHistoryItem;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
@TestTargetClass(android.webkit.WebHistoryItem.class)
public class WebHistoryItemTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
+ private final static long TEST_TIMEOUT = 10000;
private CtsTestServer mWebServer;
+ private WebViewOnUiThread mOnUiThread;
public WebHistoryItemTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
@@ -44,6 +40,7 @@
protected void setUp() throws Exception {
super.setUp();
mWebServer = new CtsTestServer(getActivity());
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
}
@Override
@@ -75,14 +72,12 @@
)
})
public void testWebHistoryItem() {
- final WebView view = getActivity().getWebView();
- view.setWebChromeClient(new WebChromeClient());
- WebBackForwardList list = view.copyBackForwardList();
+ WebBackForwardList list = mOnUiThread.copyBackForwardList();
assertEquals(0, list.getSize());
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- assertLoadUrlSuccessfully(view, url);
- list = view.copyBackForwardList();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ list = mOnUiThread.copyBackForwardList();
assertEquals(1, list.getSize());
WebHistoryItem item = list.getCurrentItem();
assertNotNull(item);
@@ -90,12 +85,12 @@
assertEquals(url, item.getUrl());
assertNull(item.getOriginalUrl());
assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, item.getTitle());
- Bitmap icon = view.getFavicon();
+ Bitmap icon = mOnUiThread.getFavicon();
assertEquals(icon, item.getFavicon());
url = mWebServer.getAssetUrl(TestHtmlConstants.BR_TAG_URL);
- assertLoadUrlSuccessfully(view, url);
- list = view.copyBackForwardList();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ list = mOnUiThread.copyBackForwardList();
assertEquals(2, list.getSize());
item = list.getCurrentItem();
assertNotNull(item);
@@ -103,15 +98,4 @@
int secondId = item.getId();
assertTrue(firstId != secondId);
}
-
- private void assertLoadUrlSuccessfully(final WebView view, String url) {
- view.loadUrl(url);
- // wait for the page load to complete
- new DelayedCheck(10000) {
- @Override
- protected boolean check() {
- return view.getProgress() == 100;
- }
- }.run();
- }
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 05e668b..386b214 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -15,25 +15,23 @@
*/
package android.webkit.cts;
+import android.cts.util.PollingCheck;
+import android.os.Build;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebSettings.LayoutAlgorithm;
+import android.webkit.WebSettings.RenderPriority;
+import android.webkit.WebSettings.TextSize;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
-import android.os.Build;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-import android.view.animation.cts.DelayedCheck;
-import android.webkit.MimeTypeMap;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.webkit.WebSettings.LayoutAlgorithm;
-import android.webkit.WebSettings.RenderPriority;
-import android.webkit.WebSettings.TextSize;
-
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -44,11 +42,12 @@
@TestTargetClass(android.webkit.WebSettings.class)
public class WebSettingsTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
+ private static final int WEBVIEW_TIMEOUT = 5000;
private static final String LOG_TAG = "WebSettingsTest";
- private WebView mWebView;
private WebSettings mSettings;
private CtsTestServer mWebServer;
+ private WebViewOnUiThread mOnUiThread;
public WebSettingsTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
@@ -57,12 +56,8 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
-
- // Set a web chrome client in order to receive progress updates.
- mWebView.setWebChromeClient(new WebChromeClient());
-
- mSettings = mWebView.getSettings();
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
+ mSettings = mOnUiThread.getSettings();
}
@Override
@@ -71,7 +66,7 @@
mWebServer.shutdown();
}
// clear the cache to prevent side effects
- mWebView.clearCache(true);
+ mOnUiThread.clearCache(true);
super.tearDown();
}
@@ -99,13 +94,15 @@
assertTrue(String.format("User agent string did not match expected pattern. \nExpected " +
"pattern:\n%s\nActual:\n%s", patternString, actualUserAgentString),
patternMatcher.find());
- assertEquals(Build.VERSION.RELEASE, patternMatcher.group(1));
Locale currentLocale = Locale.getDefault();
assertEquals(currentLocale.getLanguage().toLowerCase(), patternMatcher.group(2));
assertEquals(currentLocale.getCountry().toLowerCase(), patternMatcher.group(3));
- // Model is only added in release builds
- if ("REL".equals(Build.VERSION.CODENAME))
+ if ("REL".equals(Build.VERSION.CODENAME)) {
+ // Model is only added in release builds
assertEquals(Build.MODEL, patternMatcher.group(4));
+ // Release version is valid only in release builds
+ assertEquals(Build.VERSION.RELEASE, patternMatcher.group(1));
+ }
assertEquals(Build.ID, patternMatcher.group(5));
}
@@ -127,26 +124,26 @@
String defaultUserAgent = mSettings.getUserAgentString();
assertNotNull(defaultUserAgent);
- loadUrl(url);
- assertEquals(defaultUserAgent, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(defaultUserAgent, mOnUiThread.getTitle());
// attempting to set a null string has no effect
mSettings.setUserAgentString(null);
assertEquals(defaultUserAgent, mSettings.getUserAgentString());
- loadUrl(url);
- assertEquals(defaultUserAgent, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(defaultUserAgent, mOnUiThread.getTitle());
// attempting to set an empty string has no effect
mSettings.setUserAgentString("");
assertEquals(defaultUserAgent, mSettings.getUserAgentString());
- loadUrl(url);
- assertEquals(defaultUserAgent, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(defaultUserAgent, mOnUiThread.getTitle());
String customUserAgent = "Cts/test";
mSettings.setUserAgentString(customUserAgent);
assertEquals(customUserAgent, mSettings.getUserAgentString());
- loadUrl(url);
- assertEquals(customUserAgent, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(customUserAgent, mOnUiThread.getTitle());
}
@TestTargets({
@@ -168,37 +165,37 @@
mSettings.setUserAgent(1);
assertEquals(1, mSettings.getUserAgent());
- loadUrl(url);
- String userAgent1 = mWebView.getTitle();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ String userAgent1 = mOnUiThread.getTitle();
assertNotNull(userAgent1);
mSettings.setUserAgent(3);
assertEquals(1, mSettings.getUserAgent());
- loadUrl(url);
- assertEquals(userAgent1, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(userAgent1, mOnUiThread.getTitle());
mSettings.setUserAgent(2);
assertEquals(2, mSettings.getUserAgent());
- loadUrl(url);
- String userAgent2 = mWebView.getTitle();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ String userAgent2 = mOnUiThread.getTitle();
assertNotNull(userAgent2);
mSettings.setUserAgent(3);
assertEquals(2, mSettings.getUserAgent());
- loadUrl(url);
- assertEquals(userAgent2, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(userAgent2, mOnUiThread.getTitle());
mSettings.setUserAgent(0);
assertEquals(0, mSettings.getUserAgent());
- loadUrl(url);
- String userAgent0 = mWebView.getTitle();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ String userAgent0 = mOnUiThread.getTitle();
assertNotNull(userAgent0);
final String customUserAgent = "Cts/Test";
mSettings.setUserAgentString(customUserAgent);
assertEquals(-1, mSettings.getUserAgent());
- loadUrl(url);
- assertEquals(customUserAgent, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(customUserAgent, mOnUiThread.getTitle());
}
@@ -218,21 +215,20 @@
assertTrue(mSettings.getAllowFileAccess());
String fileUrl = TestHtmlConstants.getFileUrl(TestHtmlConstants.HELLO_WORLD_URL);
- loadUrl(fileUrl);
- assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(fileUrl);
+ assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mOnUiThread.getTitle());
fileUrl = TestHtmlConstants.getFileUrl(TestHtmlConstants.BR_TAG_URL);
mSettings.setAllowFileAccess(false);
assertFalse(mSettings.getAllowFileAccess());
-
- loadUrl(fileUrl);
+ mOnUiThread.loadUrlAndWaitForCompletion(fileUrl);
// android_asset URLs should still be loaded when even with file access
// disabled.
- assertEquals(TestHtmlConstants.BR_TAG_TITLE, mWebView.getTitle());
+ assertEquals(TestHtmlConstants.BR_TAG_TITLE, mOnUiThread.getTitle());
// Files on the file system should not be loaded.
- loadUrl(TestHtmlConstants.LOCAL_FILESYSTEM_URL);
- assertEquals(TestHtmlConstants.WEBPAGE_NOT_AVAILABLE_TITLE, mWebView.getTitle());
+ mOnUiThread.loadUrlAndWaitForCompletion(TestHtmlConstants.LOCAL_FILESYSTEM_URL);
+ assertEquals(TestHtmlConstants.WEBPAGE_NOT_AVAILABLE_TITLE, mOnUiThread.getTitle());
}
@TestTargets({
@@ -251,18 +247,18 @@
String url = TestHtmlConstants.EMBEDDED_IMG_URL;
final String ext = MimeTypeMap.getFileExtensionFromUrl(url);
- mWebView.clearCache(true);
+ mOnUiThread.clearCache(true);
assertFalse(mSettings.getBlockNetworkImage());
assertTrue(mSettings.getLoadsImagesAutomatically());
loadAssetUrl(url);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !mWebServer.getLastRequestUrl().endsWith(ext);
}
}.run();
- mWebView.clearCache(true);
+ mOnUiThread.clearCache(true);
mSettings.setBlockNetworkImage(true);
assertTrue(mSettings.getBlockNetworkImage());
loadAssetUrl(url);
@@ -540,30 +536,31 @@
)
})
public void testAccessJavaScriptCanOpenWindowsAutomatically() throws Exception {
- mWebView.setWebViewClient(new WebViewClient());
mSettings.setJavaScriptEnabled(true);
mSettings.setJavaScriptCanOpenWindowsAutomatically(false);
assertFalse(mSettings.getJavaScriptCanOpenWindowsAutomatically());
loadAssetUrl(TestHtmlConstants.POPUP_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(WEBVIEW_TIMEOUT) {
+ @Override
protected boolean check() {
- String title = mWebView.getTitle();
+ String title = mOnUiThread.getTitle();
return title != null && title.length() > 0;
}
}.run();
- assertEquals("Popup blocked", mWebView.getTitle());
+ assertEquals("Popup blocked", mOnUiThread.getTitle());
mSettings.setJavaScriptCanOpenWindowsAutomatically(true);
assertTrue(mSettings.getJavaScriptCanOpenWindowsAutomatically());
loadAssetUrl(TestHtmlConstants.POPUP_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(WEBVIEW_TIMEOUT) {
+ @Override
protected boolean check() {
- String title = mWebView.getTitle();
+ String title = mOnUiThread.getTitle();
return title != null && title.length() > 0;
}
}.run();
- assertEquals("Popup allowed", mWebView.getTitle());
+ assertEquals("Popup allowed", mOnUiThread.getTitle());
}
@TestTargets({
@@ -582,24 +579,24 @@
mSettings.setJavaScriptEnabled(true);
assertTrue(mSettings.getJavaScriptEnabled());
loadAssetUrl(TestHtmlConstants.JAVASCRIPT_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(WEBVIEW_TIMEOUT) {
@Override
protected boolean check() {
- return mWebView.getTitle() != null;
+ return mOnUiThread.getTitle() != null;
}
}.run();
- assertEquals("javascript on", mWebView.getTitle());
+ assertEquals("javascript on", mOnUiThread.getTitle());
mSettings.setJavaScriptEnabled(false);
assertFalse(mSettings.getJavaScriptEnabled());
loadAssetUrl(TestHtmlConstants.JAVASCRIPT_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(WEBVIEW_TIMEOUT) {
@Override
protected boolean check() {
- return mWebView.getTitle() != null;
+ return mOnUiThread.getTitle() != null;
}
}.run();
- assertEquals("javascript off", mWebView.getTitle());
+ assertEquals("javascript off", mOnUiThread.getTitle());
}
@TestTargets({
@@ -662,7 +659,7 @@
@ToBeFixed( bug = "1665811", explanation = "Can not check whether methods " +
"take effect by automatic testing")
public void testAccessLoadsImagesAutomatically() throws Exception {
- mWebView.clearCache(true);
+ mOnUiThread.clearCache(true);
assertTrue(mSettings.getLoadsImagesAutomatically());
String url = TestHtmlConstants.EMBEDDED_IMG_URL;
String ext = MimeTypeMap.getFileExtensionFromUrl(url);
@@ -670,7 +667,7 @@
Thread.sleep(1000);
assertFalse(mWebServer.getLastRequestUrl().endsWith(ext));
- mWebView.clearCache(true);
+ mOnUiThread.clearCache(true);
mSettings.setLoadsImagesAutomatically(false);
assertFalse(mSettings.getLoadsImagesAutomatically());
loadAssetUrl(url);
@@ -972,10 +969,15 @@
})
@ToBeFixed( bug = "1665811", explanation = "Can not check whether methods " +
"take effect by automatic testing")
- public void testAccessSupportZoom() {
+ public void testAccessSupportZoom() throws Throwable {
assertTrue(mSettings.supportZoom());
- mSettings.setSupportZoom(false);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mSettings.setSupportZoom(false);
+ }
+ });
assertFalse(mSettings.supportZoom());
}
@@ -993,10 +995,15 @@
})
@ToBeFixed( bug = "1665811", explanation = "Can not check whether methods " +
"take effect by automatic testing")
- public void testAccessBuiltInZoomControls() {
+ public void testAccessBuiltInZoomControls() throws Throwable {
assertFalse(mSettings.getBuiltInZoomControls());
- mSettings.setBuiltInZoomControls(true);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mSettings.setBuiltInZoomControls(true);
+ }
+ });
assertTrue(mSettings.getBuiltInZoomControls());
}
@@ -1007,26 +1014,70 @@
args = {}
)
})
- public void testSetAppCacheEnabled() throws Exception {
- // Tests that when AppCache is enabled and used, but the database path
- // is not set or is set to an inaccessible path, the WebView does not crash.
+ public void testAppCacheDisabled() throws Throwable {
+ // Test that when AppCache is disabled, we don't get any AppCache
+ // callbacks.
startWebServer();
- String url = mWebServer.getAppCacheUrl();
+ final String url = mWebServer.getAppCacheUrl();
+ mSettings.setJavaScriptEnabled(true);
+
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ new PollingCheck(WEBVIEW_TIMEOUT) {
+ protected boolean check() {
+ return "Loaded".equals(mOnUiThread.getTitle());
+ }
+ }.run();
+ // The page is now loaded. Wait for a further 1s to check no AppCache
+ // callbacks occur.
+ Thread.sleep(1000);
+ assertEquals("Loaded", mOnUiThread.getTitle());
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAppCacheEnabled",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAppCachePath",
+ args = {}
+ )
+ })
+ public void testAppCacheEnabled() throws Throwable {
+ // Note that the AppCache path can only be set once. This limits the
+ // amount of testing we can do, and means that we must test all aspects
+ // of setting the AppCache path in a single test to guarantee ordering.
+
+ // Test that when AppCache is enabled but no valid path is provided,
+ // we don't get any AppCache callbacks.
+ startWebServer();
+ final String url = mWebServer.getAppCacheUrl();
mSettings.setAppCacheEnabled(true);
mSettings.setJavaScriptEnabled(true);
- loadUrl(url);
- new DelayedCheck(10000) {
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ new PollingCheck(WEBVIEW_TIMEOUT) {
+ @Override
protected boolean check() {
- return mWebView.getTitle() != null && mWebView.getTitle().equals("Done");
+ return "Loaded".equals(mOnUiThread.getTitle());
}
}.run();
+ // The page is now loaded. Wait for a further 1s to check no AppCache
+ // callbacks occur.
+ Thread.sleep(1000);
+ assertEquals("Loaded", mOnUiThread.getTitle());
- mSettings.setAppCachePath("/data/foo");
- loadUrl(url);
- new DelayedCheck(10000) {
+ // Test that when AppCache is enabled and a valid path is provided, we
+ // get an AppCache callback of some kind.
+ mSettings.setAppCachePath(getActivity().getDir("appcache", 0).getPath());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ new PollingCheck(WEBVIEW_TIMEOUT) {
+ @Override
protected boolean check() {
- return mWebView.getTitle() != null && mWebView.getTitle().equals("Done");
+ return mOnUiThread.getTitle() != null
+ && mOnUiThread.getTitle().endsWith("Callback");
}
}.run();
}
@@ -1054,22 +1105,6 @@
startWebServer();
}
String url = mWebServer.getAssetUrl(asset);
- loadUrl(url);
- }
-
- /**
- * Fully load the page at the given URL.
- *
- * @param url The URL of the page to load.
- */
- private void loadUrl(String url) {
- mWebView.loadUrl(url);
- new DelayedCheck(10000) {
- @Override
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- assertEquals(100, mWebView.getProgress());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
}
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 2cd2deb..9d65200 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -16,28 +16,27 @@
package android.webkit.cts;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
-
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.os.Message;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.HttpAuthHandler;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
-import android.webkit.WebChromeClient;
-
+import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
@TestTargetClass(android.webkit.WebViewClient.class)
public class WebViewClientTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
private static final long TEST_TIMEOUT = 5000;
- private WebView mWebView;
+ private WebViewOnUiThread mOnUiThread;
private CtsTestServer mWebServer;
public WebViewClientTest() {
@@ -47,14 +46,13 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mWebView = getActivity().getWebView();
- mWebView.setWebChromeClient(new WebChromeClient());
+ mOnUiThread = new WebViewOnUiThread(this, getActivity().getWebView());
}
@Override
protected void tearDown() throws Exception {
- mWebView.clearHistory();
- mWebView.clearCache(true);
+ mOnUiThread.clearHistory();
+ mOnUiThread.clearCache(true);
if (mWebServer != null) {
mWebServer.shutdown();
}
@@ -68,7 +66,7 @@
)
public void testShouldOverrideUrlLoading() {
final MockWebViewClient webViewClient = new MockWebViewClient();
- assertFalse(webViewClient.shouldOverrideUrlLoading(mWebView, null));
+ assertFalse(webViewClient.shouldOverrideUrlLoading(mOnUiThread.getWebView(), null));
}
@TestTargets({
@@ -90,28 +88,31 @@
})
public void testLoadPage() throws Exception {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
mWebServer = new CtsTestServer(getActivity());
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
assertFalse(webViewClient.hasOnPageStartedCalled());
assertFalse(webViewClient.hasOnLoadResourceCalled());
assertFalse(webViewClient.hasOnPageFinishedCalled());
- mWebView.loadUrl(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return webViewClient.hasOnPageStartedCalled();
}
}.run();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return webViewClient.hasOnLoadResourceCalled();
}
}.run();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return webViewClient.hasOnPageFinishedCalled();
}
@@ -125,11 +126,11 @@
)
public void testOnReceivedError() throws Exception {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
String wrongUri = "invalidscheme://some/resource";
assertEquals(0, webViewClient.hasOnReceivedErrorCode());
- assertLoadUrlSuccessfully(mWebView, wrongUri);
+ mOnUiThread.loadUrlAndWaitForCompletion(wrongUri);
assertEquals(WebViewClient.ERROR_UNSUPPORTED_SCHEME,
webViewClient.hasOnReceivedErrorCode());
}
@@ -141,21 +142,23 @@
)
public void testOnFormResubmission() throws Exception {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
- final WebSettings settings = mWebView.getSettings();
+ mOnUiThread.setWebViewClient(webViewClient);
+ final WebSettings settings = mOnUiThread.getSettings();
settings.setJavaScriptEnabled(true);
mWebServer = new CtsTestServer(getActivity());
assertFalse(webViewClient.hasOnFormResubmissionCalled());
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_FORM_URL);
// this loads a form, which automatically posts itself
- assertLoadUrlSuccessfully(mWebView, url);
- Thread.sleep(1000); // allow for javascript to post the form
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ // wait for JavaScript to post the form
+ mOnUiThread.waitForLoadCompletion();
// the URL should have changed when the form was posted
- assertFalse(url.equals(mWebView.getUrl()));
+ assertFalse(url.equals(mOnUiThread.getUrl()));
// reloading the current URL should trigger the callback
- mWebView.reload();
- new DelayedCheck(TEST_TIMEOUT) {
+ mOnUiThread.reload();
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return webViewClient.hasOnFormResubmissionCalled();
}
@@ -169,15 +172,16 @@
)
public void testDoUpdateVisitedHistory() throws Exception {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
mWebServer = new CtsTestServer(getActivity());
assertFalse(webViewClient.hasDoUpdateVisitedHistoryCalled());
String url1 = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
String url2 = mWebServer.getAssetUrl(TestHtmlConstants.BR_TAG_URL);
- assertLoadUrlSuccessfully(mWebView, url1);
- assertLoadUrlSuccessfully(mWebView, url2);
- new DelayedCheck(TEST_TIMEOUT) {
+ mOnUiThread.loadUrlAndWaitForCompletion(url1);
+ mOnUiThread.loadUrlAndWaitForCompletion(url2);
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return webViewClient.hasDoUpdateVisitedHistoryCalled();
}
@@ -191,12 +195,12 @@
)
public void testOnReceivedHttpAuthRequest() throws Exception {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
mWebServer = new CtsTestServer(getActivity());
assertFalse(webViewClient.hasOnReceivedHttpAuthRequestCalled());
String url = mWebServer.getAuthAssetUrl(TestHtmlConstants.EMBEDDED_IMG_URL);
- assertLoadUrlSuccessfully(mWebView, url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertTrue(webViewClient.hasOnReceivedHttpAuthRequestCalled());
}
@@ -207,9 +211,9 @@
)
public void testShouldOverrideKeyEvent() {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
- assertFalse(webViewClient.shouldOverrideKeyEvent(mWebView, null));
+ assertFalse(webViewClient.shouldOverrideKeyEvent(mOnUiThread.getWebView(), null));
}
@TestTargetNew(
@@ -219,19 +223,16 @@
)
public void testOnUnhandledKeyEvent() throws Throwable {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.requestFocus();
- }
- });
+ mOnUiThread.requestFocus();
getInstrumentation().waitForIdleSync();
assertFalse(webViewClient.hasOnUnhandledKeyEventCalled());
sendKeys(KeyEvent.KEYCODE_1);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return webViewClient.hasOnUnhandledKeyEventCalled();
}
@@ -245,30 +246,15 @@
)
public void testOnScaleChanged() throws Throwable {
final MockWebViewClient webViewClient = new MockWebViewClient();
- mWebView.setWebViewClient(webViewClient);
+ mOnUiThread.setWebViewClient(webViewClient);
assertFalse(webViewClient.hasOnScaleChangedCalled());
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.zoomIn();
- }
- });
+ mOnUiThread.zoomIn();
getInstrumentation().waitForIdleSync();
assertTrue(webViewClient.hasOnScaleChangedCalled());
}
- private void assertLoadUrlSuccessfully(final WebView view, String url) {
- view.loadUrl(url);
- // wait until load is complete
- new DelayedCheck(TEST_TIMEOUT) {
- @Override
- protected boolean check() {
- return view.getProgress() == 100;
- }
- }.run();
- }
-
- private class MockWebViewClient extends WebViewClient {
+ private class MockWebViewClient extends WaitForLoadedClient {
private boolean mOnPageStartedCalled;
private boolean mOnPageFinishedCalled;
private boolean mOnLoadResourceCalled;
@@ -279,6 +265,10 @@
private boolean mOnUnhandledKeyEventCalled;
private boolean mOnScaleChangedCalled;
+ public MockWebViewClient() {
+ super(mOnUiThread);
+ }
+
public boolean hasOnPageStartedCalled() {
return mOnPageStartedCalled;
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index db0f685..7bb31cf 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -16,22 +16,16 @@
package android.webkit.cts;
-import dalvik.annotation.BrokenTest;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
-
import android.content.Context;
import android.content.res.AssetManager;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Picture;
import android.graphics.Rect;
-import android.graphics.Bitmap.Config;
import android.net.Uri;
import android.net.http.SslCertificate;
import android.net.http.SslError;
@@ -44,11 +38,9 @@
import android.test.UiThreadTest;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
-import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CacheManager;
import android.webkit.CacheManager.CacheResult;
import android.webkit.ConsoleMessage;
@@ -58,41 +50,41 @@
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.webkit.WebViewDatabase;
import android.webkit.WebView.HitTestResult;
import android.webkit.WebView.PictureListener;
-import android.widget.AutoCompleteTextView;
+import android.webkit.WebViewClient;
+import android.webkit.WebViewDatabase;
+import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
+import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
import android.widget.LinearLayout;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.util.Date;
-import junit.framework.Assert;
-
@TestTargetClass(android.webkit.WebView.class)
public class WebViewTest extends ActivityInstrumentationTestCase2<WebViewStubActivity> {
private static final String LOGTAG = "WebViewTest";
private static final int INITIAL_PROGRESS = 100;
private static long TEST_TIMEOUT = 20000L;
- private static long TIME_FOR_LAYOUT = 1000L;
private WebView mWebView;
private CtsTestServer mWebServer;
- private boolean mIsUiThreadDone;
+ private WebViewOnUiThread mOnUiThread;
public WebViewTest() {
super("com.android.cts.stub", WebViewStubActivity.class);
}
@Override
- public void runTestOnUiThread(Runnable runnable) throws Throwable {
- mIsUiThreadDone = false;
- super.runTestOnUiThread(runnable);
- }
-
- @Override
protected void setUp() throws Exception {
super.setUp();
mWebView = getActivity().getWebView();
@@ -100,20 +92,13 @@
if (f.exists()) {
f.delete();
}
+ mOnUiThread = new WebViewOnUiThread(this, mWebView);
}
@Override
protected void tearDown() throws Exception {
- try {
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.clearHistory();
- mWebView.clearCache(true);
- }
- });
- } catch(Throwable t) {
- Log.w(LOGTAG, "tearDown(): Caught exception when posting Runnable to UI thread");
- }
+ mOnUiThread.clearHistory();
+ mOnUiThread.clearCache(true);
if (mWebServer != null) {
mWebServer.shutdown();
}
@@ -161,14 +146,16 @@
* http://en.wikipedia.org/wiki/Postal_address#United_States
* http://www.usps.com/
*/
+ // full address, invalid zip code
+ assertNull(WebView.findAddress("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFORNIA 92926"));
// full address
- assertEquals("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFORNIA 92926",
- WebView.findAddress("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFORNIA 92926"));
+ assertEquals("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFORNIA 92826",
+ WebView.findAddress("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFORNIA 92826"));
// full address ( with abbreviated street type and state)
- assertEquals("455 LARKSPUR DR CALIFORNIA SPRINGS CA 92926",
- WebView.findAddress("455 LARKSPUR DR CALIFORNIA SPRINGS CA 92926"));
+ assertEquals("455 LARKSPUR DR CALIFORNIA SPRINGS CA 92826",
+ WebView.findAddress("455 LARKSPUR DR CALIFORNIA SPRINGS CA 92826"));
// misspell the state ( CALIFORNIA -> CALIFONIA )
- assertNull(WebView.findAddress("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFONIA 92926"));
+ assertNull(WebView.findAddress("455 LARKSPUR DRIVE CALIFORNIA SPRINGS CALIFONIA 92826"));
// without optional zip code
assertEquals("455 LARKSPUR DR CALIFORNIA SPRINGS CA",
WebView.findAddress("455 LARKSPUR DR CALIFORNIA SPRINGS CA"));
@@ -216,7 +203,7 @@
assertTrue(settings.supportZoom());
startWebServer(false);
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
mWebView.invokeZoomPicker();
}
@@ -405,8 +392,7 @@
startWebServer(false);
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- mWebView.loadUrl(url);
- waitForLoadComplete();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals(100, mWebView.getProgress());
assertEquals(url, mWebView.getUrl());
assertEquals(url, mWebView.getOriginalUrl());
@@ -425,37 +411,25 @@
args = {}
)
})
+ @UiThreadTest
public void testGetOriginalUrl() throws Throwable {
startWebServer(false);
final String finalUrl = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
final String redirectUrl =
mWebServer.getRedirectingAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertNull(mWebView.getUrl());
- assertNull(mWebView.getOriginalUrl());
+ assertNull(mWebView.getUrl());
+ assertNull(mWebView.getOriginalUrl());
- // By default, WebView sends an intent to ask the system to
- // handle loading a new URL. We set a WebViewClient as
- // WebViewClient.shouldOverrideUrlLoading() returns false, so
- // the WebView will load the new URL.
- mWebView.setWebViewClient(new WebViewClient());
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.loadUrl(redirectUrl);
- }
- });
+ // By default, WebView sends an intent to ask the system to
+ // handle loading a new URL. We set a WebViewClient as
+ // WebViewClient.shouldOverrideUrlLoading() returns false, so
+ // the WebView will load the new URL.
+ mOnUiThread.setWebViewClient(new WaitForLoadedClient(mOnUiThread));
+ mOnUiThread.loadUrlAndWaitForCompletion(redirectUrl);
- // We need to yield the UI thread to allow the callback to
- // WebViewClient.shouldOverrideUrlLoading() to be made.
- waitForUiThreadDone();
-
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(finalUrl, mWebView.getUrl());
- assertEquals(redirectUrl, mWebView.getOriginalUrl());
- }
- });
+ assertEquals(finalUrl, mWebView.getUrl());
+ assertEquals(redirectUrl, mWebView.getOriginalUrl());
}
@TestTargetNew(
@@ -472,7 +446,7 @@
String url = mWebServer.getDelayedAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
mWebView.loadUrl(url);
mWebView.stopLoading();
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return 100 == mWebView.getProgress();
@@ -523,38 +497,38 @@
String url2 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2);
String url3 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL3);
- assertLoadUrlSuccessfully(url1);
- delayedCheckWebBackForwardList(url1, 0, 1);
+ mOnUiThread.loadUrlAndWaitForCompletion(url1);
+ pollingCheckWebBackForwardList(url1, 0, 1);
assertGoBackOrForwardBySteps(false, -1);
assertGoBackOrForwardBySteps(false, 1);
- assertLoadUrlSuccessfully(url2);
- delayedCheckWebBackForwardList(url2, 1, 2);
+ mOnUiThread.loadUrlAndWaitForCompletion(url2);
+ pollingCheckWebBackForwardList(url2, 1, 2);
assertGoBackOrForwardBySteps(true, -1);
assertGoBackOrForwardBySteps(false, 1);
- assertLoadUrlSuccessfully(url3);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ mOnUiThread.loadUrlAndWaitForCompletion(url3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
assertGoBackOrForwardBySteps(true, -2);
assertGoBackOrForwardBySteps(false, 1);
mWebView.goBack();
- delayedCheckWebBackForwardList(url2, 1, 3);
+ pollingCheckWebBackForwardList(url2, 1, 3);
assertGoBackOrForwardBySteps(true, -1);
assertGoBackOrForwardBySteps(true, 1);
mWebView.goForward();
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
assertGoBackOrForwardBySteps(true, -2);
assertGoBackOrForwardBySteps(false, 1);
mWebView.goBackOrForward(-2);
- delayedCheckWebBackForwardList(url1, 0, 3);
+ pollingCheckWebBackForwardList(url1, 0, 3);
assertGoBackOrForwardBySteps(false, -1);
assertGoBackOrForwardBySteps(true, 2);
mWebView.goBackOrForward(2);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
assertGoBackOrForwardBySteps(true, -2);
assertGoBackOrForwardBySteps(false, 1);
}
@@ -605,7 +579,7 @@
startWebServer(false);
String url = mWebServer.getAssetUrl(TestHtmlConstants.ADD_JAVA_SCRIPT_INTERFACE_URL);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals("Original title", obj.waitForResult());
}
@@ -622,72 +596,30 @@
"<body onload=\"document.title = typeof window.injectedObject;\"></body></html>";
// Test that the property is initially undefined.
- mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion(setTitleToPropertyTypeHtml,
+ "text/html", null);
assertEquals("undefined", mWebView.getTitle());
// Test that adding a null object has no effect.
mWebView.addJavascriptInterface(null, "injectedObject");
- mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion(setTitleToPropertyTypeHtml,
+ "text/html", null);
assertEquals("undefined", mWebView.getTitle());
// Test that adding an object gives an object type.
final Object obj = new Object();
mWebView.addJavascriptInterface(obj, "injectedObject");
- mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion(setTitleToPropertyTypeHtml,
+ "text/html", null);
assertEquals("object", mWebView.getTitle());
// Test that trying to replace with a null object has no effect.
mWebView.addJavascriptInterface(null, "injectedObject");
- mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion(setTitleToPropertyTypeHtml,
+ "text/html", null);
assertEquals("object", mWebView.getTitle());
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "addJavascriptInterface",
- args = {Object.class, String.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "removeJavascriptInterface",
- args = {String.class}
- )
- })
- @UiThreadTest
- public void testAddJavascriptInterfaceOddName() throws Exception {
- WebSettings settings = mWebView.getSettings();
- settings.setJavaScriptEnabled(true);
- final Object obj = new Object();
-
- // We should be able to use any character other than a single quote.
- // TODO: We currently fail when the name contains '#', '\', '\n' or '\r'.
- // See b/3279426
- //String oddNames[] = {" x y ", "`!\"$%^&*()-=_+[]{};#:@~\\|,./<>?\n\r ", " ", "\n", ""};
- String oddNames[] = {" x y ", "`!\"$%^&*()-=_+[]{};:@~|,./<>? ", " ", ""};
- for (String name : oddNames) {
- String setTitleToPropertyTypeHtml = "<html><head>" +
- "<script>function updateTitle() { document.title = typeof window['" +
- name +
- "']; }</script>" +
- "</head><body onload=\"updateTitle();\"></body></html>";
-
- mWebView.addJavascriptInterface(obj, name);
- mWebView.loadData(Uri.encode(setTitleToPropertyTypeHtml), "text/html", null);
- waitForLoadComplete();
- assertEquals("object", mWebView.getTitle());
-
- mWebView.removeJavascriptInterface(name);
- mWebView.loadData(Uri.encode(setTitleToPropertyTypeHtml), "text/html", null);
- waitForLoadComplete();
- assertEquals("undefined", mWebView.getTitle());
- }
- }
-
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "removeJavascriptInterface",
@@ -702,14 +634,14 @@
// Test that adding an object gives an object type.
mWebView.addJavascriptInterface(new Object(), "injectedObject");
- mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion(setTitleToPropertyTypeHtml,
+ "text/html", null);
assertEquals("object", mWebView.getTitle());
// Test that reloading the page after removing the object leaves the property undefined.
mWebView.removeJavascriptInterface("injectedObject");
- mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion(setTitleToPropertyTypeHtml,
+ "text/html", null);
assertEquals("undefined", mWebView.getTitle());
}
@@ -725,12 +657,8 @@
return "removedObject";
}
public void remove() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.removeJavascriptInterface("removedObject");
- System.gc();
- }
- });
+ mOnUiThread.removeJavascriptInterface("removedObject");
+ System.gc();
}
}
class ResultObject {
@@ -755,17 +683,13 @@
// Test that an object is still usable if removed while the page is in use, even if we have
// no external references to it.
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.getSettings().setJavaScriptEnabled(true);
- mWebView.addJavascriptInterface(new RemovedObject(), "removedObject");
- mWebView.addJavascriptInterface(resultObject, "resultObject");
- mWebView.loadData("<html><head></head>" +
- "<body onload=\"window.removedObject.remove();" +
- "resultObject.setResult(removedObject.toString());\"></body></html>",
- "text/html", null);
- }
- });
+ mOnUiThread.getSettings().setJavaScriptEnabled(true);
+ mOnUiThread.addJavascriptInterface(new RemovedObject(), "removedObject");
+ mOnUiThread.addJavascriptInterface(resultObject, "resultObject");
+ mOnUiThread.loadDataAndWaitForCompletion("<html><head></head>" +
+ "<body onload=\"window.removedObject.remove();" +
+ "resultObject.setResult(removedObject.toString());\"></body></html>",
+ "text/html", null);
assertEquals("removedObject", resultObject.getResult());
}
@@ -789,17 +713,13 @@
public void testCapturePicture() throws Exception, Throwable {
startWebServer(false);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.BLANK_PAGE_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- // showing the blank page will make the picture filled with background color
- mWebView.loadUrl(url);
- waitForLoadComplete();
- }
- });
+ // showing the blank page will make the picture filled with background color
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
getInstrumentation().waitForIdleSync();
class PictureRunnable implements Runnable {
private Picture mPicture;
+ @Override
public void run() {
mPicture = mWebView.capturePicture();
Bitmap b = Bitmap.createBitmap(mPicture.getWidth(), mPicture.getHeight(),
@@ -809,8 +729,7 @@
assertBitmapFillWithColor(b, Color.WHITE);
mWebView.setBackgroundColor(Color.CYAN);
- mWebView.reload();
- waitForLoadComplete();
+ mOnUiThread.reloadAndWaitForCompletion();
}
public Picture getPicture() {
return mPicture;
@@ -827,6 +746,7 @@
assertBitmapFillWithColor(b, Color.WHITE);
runTestOnUiThread(new Runnable() {
+ @Override
public void run() {
// update the content
Picture p = mWebView.capturePicture();
@@ -848,7 +768,11 @@
public WebView webView;
public Picture picture;
+ @Override
public void onNewPicture(WebView view, Picture picture) {
+ // Need to inform the listener tracking new picture
+ // for the "page loaded" knowledge since it has been replaced.
+ mOnUiThread.onNewPicture();
this.callCount += 1;
this.webView = view;
this.picture = picture;
@@ -858,13 +782,10 @@
final MyPictureListener listener = new MyPictureListener();
startWebServer(false);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setPictureListener(listener);
- assertLoadUrlSuccessfully(url);
- }
- });
- new DelayedCheck(TEST_TIMEOUT) {
+ mOnUiThread.setPictureListener(listener);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return listener.callCount > 0;
}
@@ -874,12 +795,9 @@
final int oldCallCount = listener.callCount;
final String newUrl = mWebServer.getAssetUrl(TestHtmlConstants.SMALL_IMG_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertLoadUrlSuccessfully(newUrl);
- }
- });
- new DelayedCheck(TEST_TIMEOUT) {
+ mOnUiThread.loadUrlAndWaitForCompletion(newUrl);
+ new PollingCheck(TEST_TIMEOUT) {
+ @Override
protected boolean check() {
return listener.callCount > oldCallCount;
}
@@ -908,11 +826,7 @@
mWebView.setBackgroundColor(Color.CYAN);
startWebServer(false);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.BLANK_PAGE_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertLoadUrlSuccessfully(url);
- }
- });
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
getInstrumentation().waitForIdleSync();
final Bundle bundle = new Bundle();
@@ -924,14 +838,10 @@
try {
assertTrue(bundle.isEmpty());
assertEquals(0, f.length());
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertTrue(mWebView.savePicture(bundle, f));
- }
- });
+ assertTrue(mOnUiThread.savePicture(bundle, f));
// File saving is done in a separate thread.
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return f.length() > 0;
@@ -945,16 +855,12 @@
p.draw(new Canvas(b));
assertBitmapFillWithColor(b, Color.CYAN);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setBackgroundColor(Color.WHITE);
- mWebView.reload();
- waitForLoadComplete();
- }
- });
+ mOnUiThread.setBackgroundColor(Color.WHITE);
+ mOnUiThread.reloadAndWaitForCompletion();
getInstrumentation().waitForIdleSync();
runTestOnUiThread(new Runnable() {
+ @Override
public void run() {
Bitmap b = Bitmap.createBitmap(mWebView.getWidth(), mWebView.getHeight(),
Config.ARGB_8888);
@@ -1095,21 +1001,23 @@
)
})
public void testLoadData() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertNull(mWebView.getTitle());
- mWebView.loadData("<html><head><title>Hello,World!</title></head><body></body>" +
- "</html>",
- "text/html", null);
- waitForLoadComplete();
- assertEquals("Hello,World!", mWebView.getTitle());
- }
- });
+ final String HTML_CONTENT =
+ "<html><head><title>Hello,World!</title></head><body></body>" +
+ "</html>";
+ assertNull(mOnUiThread.getTitle());
+ mOnUiThread.loadDataAndWaitForCompletion(HTML_CONTENT,
+ "text/html", null);
+ assertEquals("Hello,World!", mOnUiThread.getTitle());
// Test that JavaScript can't access cross-origin content.
- class ConsoleMessageWebChromeClient extends WebChromeClient {
+ class ConsoleMessageWebChromeClient extends WaitForProgressClient {
private boolean mIsMessageLevelAvailable;
private ConsoleMessage.MessageLevel mMessageLevel;
+
+ public ConsoleMessageWebChromeClient() {
+ super(mOnUiThread);
+ }
+
@Override
public synchronized boolean onConsoleMessage(ConsoleMessage message) {
mMessageLevel = message.messageLevel();
@@ -1131,10 +1039,12 @@
final ConsoleMessageWebChromeClient webChromeClient = new ConsoleMessageWebChromeClient();
final String crossOriginUrl = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
runTestOnUiThread(new Runnable() {
+ @Override
public void run() {
mWebView.getSettings().setJavaScriptEnabled(true);
- mWebView.setWebChromeClient(webChromeClient);
- mWebView.loadData("<html><head></head><body onload=\"" +
+ mOnUiThread.setWebChromeClient(webChromeClient);
+ mOnUiThread.loadDataAndWaitForCompletion(
+ "<html><head></head><body onload=\"" +
"document.title = " +
"document.getElementById('frame').contentWindow.location.href;" +
"\"><iframe id=\"frame\" src=\"" + crossOriginUrl + "\"></body></html>",
@@ -1171,38 +1081,36 @@
startWebServer(false);
String baseUrl = mWebServer.getAssetUrl("foo.html");
String historyUrl = "random";
- mWebView.loadDataWithBaseURL(baseUrl,
+ mOnUiThread.loadDataWithBaseURLAndWaitForCompletion(baseUrl,
"<html><body><img src=\"" + imgUrl + "\"/></body></html>",
"text/html", "UTF-8", historyUrl);
- waitForLoadComplete();
assertTrue(mWebServer.getLastRequestUrl().endsWith(imgUrl));
assertEquals(historyUrl, mWebView.getUrl());
// Check that reported URL is "about:blank" when supplied history URL
// is null.
imgUrl = TestHtmlConstants.LARGE_IMG_URL;
- mWebView.loadDataWithBaseURL(baseUrl,
+ mOnUiThread.loadDataWithBaseURLAndWaitForCompletion(baseUrl,
"<html><body><img src=\"" + imgUrl + "\"/></body></html>",
"text/html", "UTF-8", null);
- waitForLoadComplete();
assertTrue(mWebServer.getLastRequestUrl().endsWith(imgUrl));
assertEquals("about:blank", mWebView.getUrl());
// Test that JavaScript can access content from the same origin as the base URL.
mWebView.getSettings().setJavaScriptEnabled(true);
final String crossOriginUrl = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- mWebView.loadDataWithBaseURL(baseUrl, "<html><head></head><body onload=\"" +
+ mOnUiThread.loadDataWithBaseURLAndWaitForCompletion(baseUrl,
+ "<html><head></head><body onload=\"" +
"document.title = document.getElementById('frame').contentWindow.location.href;" +
"\"><iframe id=\"frame\" src=\"" + crossOriginUrl + "\"></body></html>",
"text/html", "UTF-8", null);
- waitForLoadComplete();
assertEquals(crossOriginUrl, mWebView.getTitle());
// Check that when the base URL uses the 'data' scheme, a 'data' scheme URL is used and the
// history URL is ignored.
- mWebView.loadDataWithBaseURL("data:foo", "<html><body>bar</body></html>",
- "text/html", "UTF-8", historyUrl);
- waitForLoadComplete();
+ mOnUiThread.loadDataWithBaseURLAndWaitForCompletion("data:foo",
+ "<html><body>bar</body></html>", "text/html", "UTF-8",
+ historyUrl);
assertTrue(mWebView.getUrl().indexOf("data:text/html,") == 0);
assertTrue(mWebView.getUrl().indexOf("bar") > 0);
}
@@ -1217,8 +1125,8 @@
public void testFindAll() {
String p = "<p>Find all instances of find on the page and highlight them.</p>";
- mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "</body></html>", "text/html", null);
assertEquals(2, mWebView.findAll("find"));
}
@@ -1241,95 +1149,72 @@
)
})
public void testFindNext() throws Throwable {
- final ScrollRunnable runnable = new ScrollRunnable();
-
- final class StopScrollingDelayedCheck extends DelayedCheck {
+ final class StopScrollingPollingCheck extends PollingCheck {
private int mPreviousScrollY = -1;
@Override
protected boolean check() {
- try {
- runTestOnUiThread(runnable);
- } catch (Throwable t) {}
+ getInstrumentation().waitForIdleSync();
+ int scrollY = mOnUiThread.getScrollY();
boolean hasStopped =
- (mPreviousScrollY == -1 ? false : (runnable.getScrollY() == mPreviousScrollY));
- mPreviousScrollY = runnable.getScrollY();
+ (mPreviousScrollY == -1 ? false : (scrollY == mPreviousScrollY));
+ mPreviousScrollY = scrollY;
return hasStopped;
}
}
- final class FindNextRunnable implements Runnable {
- private boolean mForward;
- FindNextRunnable(boolean forward) {
- mForward = forward;
- }
- public void run() {
- mWebView.findNext(mForward);
- }
- }
+ // Reset the scaling so that finding the next "all" text will require scrolling.
+ mOnUiThread.setInitialScale(100);
- runTestOnUiThread(new Runnable() {
- public void run() {
- // Reset the scaling so that finding the next "all" text will require scrolling.
- mWebView.setInitialScale(100);
+ DisplayMetrics metrics = mOnUiThread.getDisplayMetrics();
+ int dimension = Math.max(metrics.widthPixels, metrics.heightPixels);
+ // create a paragraph high enough to take up the entire screen
+ String p = "<p style=\"height:" + dimension + "px;\">" +
+ "Find all instances of a word on the page and highlight them.</p>";
- DisplayMetrics metrics = mWebView.getContext().getResources().getDisplayMetrics();
- int dimension = Math.max(metrics.widthPixels, metrics.heightPixels);
- // create a paragraph high enough to take up the entire screen
- String p = "<p style=\"height:" + dimension + "px;\">" +
- "Find all instances of a word on the page and highlight them.</p>";
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p + p + "</body></html>", "text/html", null);
- mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
-
- // highlight all the strings found
- mWebView.findAll("all");
- }
- });
+ // highlight all the strings found
+ mOnUiThread.findAll("all");
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(runnable);
- int previousScrollY = runnable.getScrollY();
+ int previousScrollY = mOnUiThread.getScrollY();
// Focus "all" in the second page and assert that the view scrolls.
- runTestOnUiThread(new FindNextRunnable(true));
- new StopScrollingDelayedCheck().run();
- assertTrue(runnable.getScrollY() > previousScrollY);
- previousScrollY = runnable.getScrollY();
+ mOnUiThread.findNext(true);
+ new StopScrollingPollingCheck().run();
+ assertTrue(mOnUiThread.getScrollY() > previousScrollY);
+ previousScrollY = mOnUiThread.getScrollY();
// Focus "all" in the first page and assert that the view scrolls.
- runTestOnUiThread(new FindNextRunnable(true));
- new StopScrollingDelayedCheck().run();
- assertTrue(runnable.getScrollY() < previousScrollY);
- previousScrollY = runnable.getScrollY();
+ mOnUiThread.findNext(true);
+ new StopScrollingPollingCheck().run();
+ assertTrue(mOnUiThread.getScrollY() < previousScrollY);
+ previousScrollY = mOnUiThread.getScrollY();
// Focus "all" in the second page and assert that the view scrolls.
- runTestOnUiThread(new FindNextRunnable(false));
- new StopScrollingDelayedCheck().run();
- assertTrue(runnable.getScrollY() > previousScrollY);
- previousScrollY = runnable.getScrollY();
+ mOnUiThread.findNext(false);
+ new StopScrollingPollingCheck().run();
+ assertTrue(mOnUiThread.getScrollY() > previousScrollY);
+ previousScrollY = mOnUiThread.getScrollY();
// Focus "all" in the first page and assert that the view scrolls.
- runTestOnUiThread(new FindNextRunnable(false));
- new StopScrollingDelayedCheck().run();
- assertTrue(runnable.getScrollY() < previousScrollY);
- previousScrollY = runnable.getScrollY();
+ mOnUiThread.findNext(false);
+ new StopScrollingPollingCheck().run();
+ assertTrue(mOnUiThread.getScrollY() < previousScrollY);
+ previousScrollY = mOnUiThread.getScrollY();
// clear the result
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.clearMatches();
- }
- });
+ mOnUiThread.clearMatches();
getInstrumentation().waitForIdleSync();
// can not scroll any more
- runTestOnUiThread(new FindNextRunnable(false));
- new StopScrollingDelayedCheck().run();
- assertTrue(runnable.getScrollY() == previousScrollY);
+ mOnUiThread.findNext(false);
+ new StopScrollingPollingCheck().run();
+ assertTrue(mOnUiThread.getScrollY() == previousScrollY);
- runTestOnUiThread(new FindNextRunnable(true));
- new StopScrollingDelayedCheck().run();
- assertTrue(runnable.getScrollY() == previousScrollY);
+ mOnUiThread.findNext(true);
+ new StopScrollingPollingCheck().run();
+ assertTrue(mOnUiThread.getScrollY() == previousScrollY);
}
@TestTargetNew(
@@ -1367,17 +1252,17 @@
new DocumentHasImageCheckHandler(mWebView.getHandler().getLooper());
runTestOnUiThread(new Runnable() {
+ @Override
public void run() {
- mWebView.loadData("<html><body><img src=\"" + imgUrl + "\"/></body></html>",
- "text/html", null);
- waitForLoadComplete();
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body><img src=\""
+ + imgUrl + "\"/></body></html>", "text/html", null);
Message response = new Message();
response.setTarget(handler);
assertFalse(handler.hasCalledHandleMessage());
mWebView.documentHasImages(response);
}
});
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1399,90 +1284,41 @@
)
})
public void testPageScroll() throws Throwable {
- final class PageUpRunnable implements Runnable {
- private boolean mResult;
- public void run() {
- mResult = mWebView.pageUp(false);
- }
- public boolean getResult() {
- return mResult;
- }
- }
-
- final class PageDownRunnable implements Runnable {
- private boolean mResult;
- public void run() {
- mResult = mWebView.pageDown(false);
- }
- public boolean getResult() {
- return mResult;
- }
- }
-
- runTestOnUiThread(new Runnable() {
- public void run() {
- DisplayMetrics metrics = mWebView.getContext().getResources().getDisplayMetrics();
- int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
- String p = "<p style=\"height:" + dimension + "px;\">" +
- "Scroll by half the size of the page.</p>";
- mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ DisplayMetrics metrics = mOnUiThread.getDisplayMetrics();
+ int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
+ String p = "<p style=\"height:" + dimension + "px;\">" +
+ "Scroll by half the size of the page.</p>";
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + p + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertTrue(mWebView.pageDown(false));
- }
- });
+ assertTrue(mOnUiThread.pageDown(false));
- PageDownRunnable pageDownRunnable = new PageDownRunnable();
do {
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(pageDownRunnable);
- } while (pageDownRunnable.getResult());
+ } while (mOnUiThread.pageDown(false));
- ScrollRunnable scrollRunnable = new ScrollRunnable();
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(scrollRunnable);
- int bottomScrollY = scrollRunnable.getScrollY();
+ int bottomScrollY = mOnUiThread.getScrollY();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertTrue(mWebView.pageUp(false));
- }
- });
+ assertTrue(mOnUiThread.pageUp(false));
- PageUpRunnable pageUpRunnable = new PageUpRunnable();
do {
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(pageUpRunnable);
- } while (pageUpRunnable.getResult());
+ } while (mOnUiThread.pageUp(false));
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(scrollRunnable);
- int topScrollY = scrollRunnable.getScrollY();
+ int topScrollY = mOnUiThread.getScrollY();
// jump to the bottom
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertTrue(mWebView.pageDown(true));
- }
- });
+ assertTrue(mOnUiThread.pageDown(true));
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(scrollRunnable);
- assertEquals(bottomScrollY, scrollRunnable.getScrollY());
+ assertEquals(bottomScrollY, mOnUiThread.getScrollY());
// jump to the top
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertTrue(mWebView.pageUp(true));
- }
- });
+ assertTrue(mOnUiThread.pageUp(true));
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(scrollRunnable);
- assertEquals(topScrollY, scrollRunnable.getScrollY());
+ assertEquals(topScrollY, mOnUiThread.getScrollY());
}
@TestTargetNew(
@@ -1491,56 +1327,27 @@
args = {}
)
public void testGetContentHeight() throws Throwable {
- final class HeightRunnable implements Runnable {
- private int mHeight;
- private int mContentHeight;
- public void run() {
- mHeight = mWebView.getHeight();
- mContentHeight = mWebView.getContentHeight();
- }
- public int getHeight() {
- return mHeight;
- }
- public int getContentHeight() {
- return mContentHeight;
- }
- }
-
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadData("<html><body></body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.loadDataAndWaitForCompletion(
+ "<html><body></body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
final int pageHeight = 600;
// set the margin to 0
final String p = "<p style=\"height:" + pageHeight
+ "px;margin:0px auto;\">Get the height of HTML content.</p>";
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(mWebView.getHeight(), mWebView.getContentHeight() * mWebView.getScale(), 2f);
- mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ assertEquals(mOnUiThread.getHeight(), mOnUiThread.getContentHeight() * mOnUiThread.getScale(), 2f);
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- HeightRunnable runnable = new HeightRunnable();
- runTestOnUiThread(runnable);
- assertTrue(runnable.getContentHeight() > pageHeight);
- int extraSpace = runnable.getContentHeight() - pageHeight;
+ assertTrue(mOnUiThread.getContentHeight() > pageHeight);
+ int extraSpace = mOnUiThread.getContentHeight() - pageHeight;
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + p + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(runnable);
- assertEquals(pageHeight + pageHeight + extraSpace, runnable.getContentHeight());
+ assertEquals(pageHeight + pageHeight + extraSpace,
+ mOnUiThread.getContentHeight());
}
@TestTargetNew(
@@ -1556,9 +1363,8 @@
startWebServer(false);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- mWebView.loadUrl(url);
- waitForLoadComplete();
- new DelayedCheck(TEST_TIMEOUT) {
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
CacheResult result = CacheManager.getCacheFile(url, null);
@@ -1575,7 +1381,7 @@
mWebView.clearCache(true);
// check the files are deleted
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return cacheFileBaseDir.list().length == 0;
@@ -1641,48 +1447,35 @@
args = {int.class, int.class}
)
public void testFlingScroll() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- DisplayMetrics metrics = mWebView.getContext().getResources().getDisplayMetrics();
- int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
- String p = "<p style=\"height:" + dimension + "px;" +
- "width:" + dimension + "px\">Test fling scroll.</p>";
- mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ DisplayMetrics metrics = mOnUiThread.getDisplayMetrics();
+ int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
+ String p = "<p style=\"height:" + dimension + "px;" +
+ "width:" + dimension + "px\">Test fling scroll.</p>";
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- ScrollRunnable runnable = new ScrollRunnable();
- runTestOnUiThread(runnable);
- int previousScrollX = runnable.getScrollX();
- int previousScrollY = runnable.getScrollY();
+ int previousScrollX = mOnUiThread.getScrollX();
+ int previousScrollY = mOnUiThread.getScrollY();
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.flingScroll(100, 100);
- }
- });
+ mOnUiThread.flingScroll(100, 100);
int timeSlice = 500;
Thread.sleep(timeSlice);
- runTestOnUiThread(runnable);
- assertTrue(runnable.getScrollX() > previousScrollX);
- assertTrue(runnable.getScrollY() > previousScrollY);
+ assertTrue(mOnUiThread.getScrollX() > previousScrollX);
+ assertTrue(mOnUiThread.getScrollY() > previousScrollY);
- previousScrollY = runnable.getScrollY();
- previousScrollX = runnable.getScrollX();
+ previousScrollY = mOnUiThread.getScrollY();
+ previousScrollX = mOnUiThread.getScrollX();
Thread.sleep(timeSlice);
- runTestOnUiThread(runnable);
- assertTrue(runnable.getScrollX() >= previousScrollX);
- assertTrue(runnable.getScrollY() >= previousScrollY);
+ assertTrue(mOnUiThread.getScrollX() >= previousScrollX);
+ assertTrue(mOnUiThread.getScrollY() >= previousScrollY);
- previousScrollY = runnable.getScrollY();
- previousScrollX = runnable.getScrollX();
+ previousScrollY = mOnUiThread.getScrollY();
+ previousScrollX = mOnUiThread.getScrollX();
Thread.sleep(timeSlice);
- runTestOnUiThread(runnable);
- assertTrue(runnable.getScrollX() >= previousScrollX);
- assertTrue(runnable.getScrollY() >= previousScrollY);
+ assertTrue(mOnUiThread.getScrollX() >= previousScrollX);
+ assertTrue(mOnUiThread.getScrollY() >= previousScrollY);
}
@TestTargetNew(
@@ -1694,12 +1487,7 @@
final String links = "<DL><p><DT><A HREF=\"" + TestHtmlConstants.HTML_URL1
+ "\">HTML_URL1</A><DT><A HREF=\"" + TestHtmlConstants.HTML_URL2
+ "\">HTML_URL2</A></DL><p>";
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadData("<html><body>" + links + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + links + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
final HrefCheckHandler handler = new HrefCheckHandler(mWebView.getHandler().getLooper());
@@ -1709,12 +1497,8 @@
// focus on first link
handler.reset();
getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.requestFocusNodeHref(hrefMsg);
- }
- });
- new DelayedCheck() {
+ mOnUiThread.requestFocusNodeHref(hrefMsg);
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1727,12 +1511,8 @@
final Message hrefMsg2 = new Message();
hrefMsg2.setTarget(handler);
getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.requestFocusNodeHref(hrefMsg2);
- }
- });
- new DelayedCheck() {
+ mOnUiThread.requestFocusNodeHref(hrefMsg2);
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1740,11 +1520,7 @@
}.run();
assertEquals(TestHtmlConstants.HTML_URL2, handler.getResultUrl());
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.requestFocusNodeHref(null);
- }
- });
+ mOnUiThread.requestFocusNodeHref(null);
}
@TestTargetNew(
@@ -1753,17 +1529,6 @@
args = {android.os.Message.class}
)
public void testRequestImageRef() throws Exception, Throwable {
- final class GetLocationRunnable implements Runnable {
- private int[] mLocation;
- public void run() {
- mLocation = new int[2];
- mWebView.getLocationOnScreen(mLocation);
- }
- public int[] getLocation() {
- return mLocation;
- }
- }
-
AssetManager assets = getActivity().getAssets();
Bitmap bitmap = BitmapFactory.decodeStream(assets.open(TestHtmlConstants.LARGE_IMG_URL));
int imgWidth = bitmap.getWidth();
@@ -1771,13 +1536,9 @@
startWebServer(false);
final String imgUrl = mWebServer.getAssetUrl(TestHtmlConstants.LARGE_IMG_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadData("<html><title>Title</title><body><img src=\"" + imgUrl
- + "\"/></body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.loadDataAndWaitForCompletion(
+ "<html><title>Title</title><body><img src=\"" + imgUrl
+ + "\"/></body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
final HrefCheckHandler handler = new HrefCheckHandler(mWebView.getHandler().getLooper());
@@ -1786,21 +1547,16 @@
// touch the image
handler.reset();
- GetLocationRunnable runnable = new GetLocationRunnable();
- runTestOnUiThread(runnable);
- int[] location = runnable.getLocation();
+ int[] location = mOnUiThread.getLocationOnScreen();
long time = SystemClock.uptimeMillis();
getInstrumentation().sendPointerSync(
MotionEvent.obtain(time, time, MotionEvent.ACTION_DOWN,
location[0] + imgWidth / 2,
location[1] + imgHeight / 2, 0));
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.requestImageRef(msg);
- }
- });
- new DelayedCheck() {
+ getInstrumentation().waitForIdleSync();
+ mOnUiThread.requestImageRef(msg);
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1825,16 +1581,6 @@
args = {}
)
public void testGetHitTestResult() throws Throwable {
- class HitTestResultRunnable implements Runnable {
- private HitTestResult mHitTestResult;
- public void run() {
- mHitTestResult = mWebView.getHitTestResult();
- }
- public HitTestResult getHitTestResult() {
- return mHitTestResult;
- }
- }
-
final String anchor = "<p><a href=\"" + TestHtmlConstants.EXT_WEB_URL1
+ "\">normal anchor</a></p>";
final String blankAnchor = "<p><a href=\"\">blank anchor</a></p>";
@@ -1847,57 +1593,52 @@
String location = "shanghai";
final String geo = "<p><a href=\"geo:0,0?q=" + location + "\">Location</a></p>";
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadDataWithBaseURL("fake://home", "<html><body>" + anchor + blankAnchor + form
- + tel + mailto + geo + "</body></html>", "text/html", "UTF-8", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.loadDataWithBaseURLAndWaitForCompletion("fake://home",
+ "<html><body>" + anchor + blankAnchor + form + tel + mailto +
+ geo + "</body></html>", "text/html", "UTF-8", null);
getInstrumentation().waitForIdleSync();
- HitTestResultRunnable runnable = new HitTestResultRunnable();
// anchor
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.SRC_ANCHOR_TYPE, runnable.getHitTestResult().getType());
- assertEquals(TestHtmlConstants.EXT_WEB_URL1, runnable.getHitTestResult().getExtra());
+ HitTestResult hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.SRC_ANCHOR_TYPE, hitTestResult.getType());
+ assertEquals(TestHtmlConstants.EXT_WEB_URL1, hitTestResult.getExtra());
// blank anchor
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.SRC_ANCHOR_TYPE, runnable.getHitTestResult().getType());
- assertEquals("fake://home", runnable.getHitTestResult().getExtra());
+ hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.SRC_ANCHOR_TYPE, hitTestResult.getType());
+ assertEquals("fake://home", hitTestResult.getExtra());
// text field
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.EDIT_TEXT_TYPE, runnable.getHitTestResult().getType());
- assertNull(runnable.getHitTestResult().getExtra());
+ hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.EDIT_TEXT_TYPE, hitTestResult.getType());
+ assertNull(hitTestResult.getExtra());
// submit button
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.UNKNOWN_TYPE, runnable.getHitTestResult().getType());
- assertNull(runnable.getHitTestResult().getExtra());
+ hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.UNKNOWN_TYPE, hitTestResult.getType());
+ assertNull(hitTestResult.getExtra());
// phone number
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.PHONE_TYPE, runnable.getHitTestResult().getType());
- assertEquals(phoneNo, runnable.getHitTestResult().getExtra());
+ hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.PHONE_TYPE, hitTestResult.getType());
+ assertEquals(phoneNo, hitTestResult.getExtra());
// email
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.EMAIL_TYPE, runnable.getHitTestResult().getType());
- assertEquals(email, runnable.getHitTestResult().getExtra());
+ hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.EMAIL_TYPE, hitTestResult.getType());
+ assertEquals(email, hitTestResult.getExtra());
// geo address
moveFocusDown();
- runTestOnUiThread(runnable);
- assertEquals(HitTestResult.GEO_TYPE, runnable.getHitTestResult().getType());
- assertEquals(location, runnable.getHitTestResult().getExtra());
+ hitTestResult = mOnUiThread.getHitTestResult();
+ assertEquals(HitTestResult.GEO_TYPE, hitTestResult.getType());
+ assertEquals(location, hitTestResult.getExtra());
}
@TestTargetNew(
@@ -1910,53 +1651,33 @@
final float defaultScale =
getInstrumentation().getTargetContext().getResources().getDisplayMetrics().density;
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(defaultScale, mWebView.getScale(), .01f);
+ assertEquals(defaultScale, mOnUiThread.getScale(), .01f);
- mWebView.setInitialScale(0);
- // modify content to fool WebKit into re-loading
- mWebView.loadData("<html><body>" + p + "2" + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.setInitialScale(0);
+ // modify content to fool WebKit into re-loading
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "2" + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(defaultScale, mWebView.getScale(), .01f);
+ assertEquals(defaultScale, mOnUiThread.getScale(), .01f);
- mWebView.setInitialScale(50);
- mWebView.loadData("<html><body>" + p + "3" + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.setInitialScale(50);
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "3" + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(0.5f, mWebView.getScale(), .02f);
+ assertEquals(0.5f, mOnUiThread.getScale(), .02f);
- mWebView.setInitialScale(0);
- mWebView.loadData("<html><body>" + p + "4" + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ mOnUiThread.setInitialScale(0);
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "4" + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(defaultScale, mWebView.getScale(), .01f);
- }
- });
+ assertEquals(defaultScale, mOnUiThread.getScale(), .01f);
}
@TestTargetNew(
@@ -1970,7 +1691,7 @@
public void testGetFavicon() throws Exception {
startWebServer(false);
String url = mWebServer.getAssetUrl(TestHtmlConstants.TEST_FAVICON_URL);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
mWebView.getFavicon();
// ToBeFixed: Favicon is not loaded automatically.
// assertNotNull(mWebView.getFavicon());
@@ -1988,19 +1709,19 @@
String url2 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2);
String url3 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL3);
- assertLoadUrlSuccessfully(url1);
- delayedCheckWebBackForwardList(url1, 0, 1);
+ mOnUiThread.loadUrlAndWaitForCompletion(url1);
+ pollingCheckWebBackForwardList(url1, 0, 1);
- assertLoadUrlSuccessfully(url2);
- delayedCheckWebBackForwardList(url2, 1, 2);
+ mOnUiThread.loadUrlAndWaitForCompletion(url2);
+ pollingCheckWebBackForwardList(url2, 1, 2);
- assertLoadUrlSuccessfully(url3);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ mOnUiThread.loadUrlAndWaitForCompletion(url3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
mWebView.clearHistory();
// only current URL is left after clearing
- delayedCheckWebBackForwardList(url3, 0, 1);
+ pollingCheckWebBackForwardList(url3, 0, 1);
}
@TestTargets({
@@ -2032,12 +1753,12 @@
String url3 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL3);
// make a history list
- assertLoadUrlSuccessfully(url1);
- delayedCheckWebBackForwardList(url1, 0, 1);
- assertLoadUrlSuccessfully(url2);
- delayedCheckWebBackForwardList(url2, 1, 2);
- assertLoadUrlSuccessfully(url3);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ mOnUiThread.loadUrlAndWaitForCompletion(url1);
+ pollingCheckWebBackForwardList(url1, 0, 1);
+ mOnUiThread.loadUrlAndWaitForCompletion(url2);
+ pollingCheckWebBackForwardList(url2, 1, 2);
+ mOnUiThread.loadUrlAndWaitForCompletion(url3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
// save the list
Bundle bundle = new Bundle();
@@ -2063,7 +1784,7 @@
assertEquals(2, saveList.getCurrentIndex());
/* ToBeFixed: The WebHistoryItems do not get inflated. Uncomment remaining tests when fixed.
// wait for the list items to get inflated
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return restoreList.getItemAtIndex(0).getUrl() != null &&
@@ -2091,8 +1812,11 @@
args = {WebViewClient.class}
)
public void testSetWebViewClient() throws Throwable {
- final class MockWebViewClient extends WebViewClient {
+ final class MockWebViewClient extends WaitForLoadedClient {
private boolean mOnScaleChangedCalled = false;
+ public MockWebViewClient() {
+ super(mOnUiThread);
+ }
@Override
public void onScaleChanged(WebView view, float oldScale, float newScale) {
super.onScaleChanged(view, oldScale, newScale);
@@ -2104,19 +1828,11 @@
}
final MockWebViewClient webViewClient = new MockWebViewClient();
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(webViewClient);
- }
- });
+ mOnUiThread.setWebViewClient(webViewClient);
getInstrumentation().waitForIdleSync();
assertFalse(webViewClient.onScaleChangedCalled());
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.zoomIn();
- }
- });
+ mOnUiThread.zoomIn();
getInstrumentation().waitForIdleSync();
assertTrue(webViewClient.onScaleChangedCalled());
}
@@ -2153,30 +1869,15 @@
args = {}
)
})
+ @UiThreadTest
public void testInsecureSiteClearsCertificate() throws Throwable {
final SslCertificate certificate =
new SslCertificate("foo", "bar", new Date(42), new Date(43));
startWebServer(false);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.setCertificate(certificate);
- mWebView.loadUrl(url);
- }
- });
- waitForUiThreadDone();
-
- runTestOnUiThread(new Runnable() {
- public void run() {
- new DelayedCheck(TEST_TIMEOUT) {
- @Override
- protected boolean check() {
- return mWebView.getCertificate() == null;
- }
- }.run();
- }
- });
+ mWebView.setCertificate(certificate);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertNull(mWebView.getCertificate());
}
@TestTargets({
@@ -2191,8 +1892,12 @@
args = {}
)
})
+ @UiThreadTest
public void testSecureSiteSetsCertificate() throws Throwable {
- final class MockWebViewClient extends WebViewClient {
+ final class MockWebViewClient extends WaitForLoadedClient {
+ public MockWebViewClient() {
+ super(mOnUiThread);
+ }
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
handler.proceed();
@@ -2201,29 +1906,12 @@
startWebServer(true);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(new MockWebViewClient());
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.setCertificate(null);
- mWebView.loadUrl(url);
- }
- });
- waitForUiThreadDone();
-
- runTestOnUiThread(new Runnable() {
- public void run() {
- new DelayedCheck(TEST_TIMEOUT) {
- @Override
- protected boolean check() {
- return mWebView.getCertificate() != null;
- }
- }.run();
- SslCertificate cert = mWebView.getCertificate();
- assertNotNull(cert);
- assertEquals("Android", cert.getIssuedTo().getUName());
- }
- });
+ mOnUiThread.setWebViewClient(new MockWebViewClient());
+ mWebView.setCertificate(null);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ SslCertificate cert = mWebView.getCertificate();
+ assertNotNull(cert);
+ assertEquals("Android", cert.getIssuedTo().getUName());
}
@TestTargetNew(
@@ -2243,9 +1931,13 @@
args = {}
)
public void testOnReceivedSslError() throws Throwable {
- final class MockWebViewClient extends WebViewClient {
+ final class MockWebViewClient extends WaitForLoadedClient {
private String mErrorUrl;
private WebView mWebView;
+
+ public MockWebViewClient() {
+ super(mOnUiThread);
+ }
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
mWebView = view;
@@ -2263,15 +1955,9 @@
startWebServer(true);
final String errorUrl = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
final MockWebViewClient webViewClient = new MockWebViewClient();
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(webViewClient);
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.clearSslPreferences();
- mWebView.loadUrl(errorUrl);
- }
- });
- waitForUiThreadDone();
+ mOnUiThread.setWebViewClient(webViewClient);
+ mOnUiThread.clearSslPreferences();
+ mOnUiThread.loadUrlAndWaitForCompletion(errorUrl);
assertEquals(mWebView, webViewClient.webView());
assertEquals(errorUrl, webViewClient.errorUrl());
@@ -2283,7 +1969,10 @@
args = {}
)
public void testOnReceivedSslErrorProceed() throws Throwable {
- final class MockWebViewClient extends WebViewClient {
+ final class MockWebViewClient extends WaitForLoadedClient {
+ public MockWebViewClient() {
+ super(mOnUiThread);
+ }
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
handler.proceed();
@@ -2292,19 +1981,9 @@
startWebServer(true);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(new MockWebViewClient());
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.loadUrl(url);
- }
- });
- waitForUiThreadDone();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mWebView.getTitle());
- }
- });
+ mOnUiThread.setWebViewClient(new MockWebViewClient());
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mOnUiThread.getTitle());
}
@TestTargetNew(
@@ -2313,7 +1992,10 @@
args = {}
)
public void testOnReceivedSslErrorCancel() throws Throwable {
- final class MockWebViewClient extends WebViewClient {
+ final class MockWebViewClient extends WaitForLoadedClient {
+ public MockWebViewClient() {
+ super(mOnUiThread);
+ }
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
handler.cancel();
@@ -2322,20 +2004,10 @@
startWebServer(true);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(new MockWebViewClient());
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.clearSslPreferences();
- mWebView.loadUrl(url);
- }
- });
- waitForUiThreadDone();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertFalse(TestHtmlConstants.HELLO_WORLD_TITLE.equals(mWebView.getTitle()));
- }
- });
+ mOnUiThread.setWebViewClient(new MockWebViewClient());
+ mOnUiThread.clearSslPreferences();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ assertFalse(TestHtmlConstants.HELLO_WORLD_TITLE.equals(mOnUiThread.getTitle()));
}
@TestTargetNew(
@@ -2349,33 +2021,18 @@
final SslErrorWebViewClient webViewClient = new SslErrorWebViewClient();
startWebServer(true);
final String firstUrl = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL1);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(webViewClient);
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.clearSslPreferences();
- mWebView.loadUrl(firstUrl);
- }
- });
- waitForUiThreadDone();
+ mOnUiThread.setWebViewClient(webViewClient);
+ mOnUiThread.clearSslPreferences();
+ mOnUiThread.loadUrlAndWaitForCompletion(firstUrl);
assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
// Load the second page. We don't expect a call to
// WebViewClient.onReceivedSslError(), but the page should load.
webViewClient.resetWasOnReceivedSslErrorCalled();
final String sameHostUrl = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadUrl(sameHostUrl);
- }
- });
- waitForUiThreadDone();
+ mOnUiThread.loadUrlAndWaitForCompletion(sameHostUrl);
assertFalse(webViewClient.wasOnReceivedSslErrorCalled());
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals("Second page", mWebView.getTitle());
- }
- });
+ assertEquals("Second page", mOnUiThread.getTitle());
}
@TestTargetNew(
@@ -2389,15 +2046,9 @@
final SslErrorWebViewClient webViewClient = new SslErrorWebViewClient();
startWebServer(true);
final String firstUrl = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL1);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebViewClient(webViewClient);
- mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
- mWebView.clearSslPreferences();
- mWebView.loadUrl(firstUrl);
- }
- });
- waitForUiThreadDone();
+ mOnUiThread.setWebViewClient(webViewClient);
+ mOnUiThread.clearSslPreferences();
+ mOnUiThread.loadUrlAndWaitForCompletion(firstUrl);
assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
// Load the second page. We expect another call to
@@ -2407,18 +2058,9 @@
// alias, but will be considered unique by the WebView.
final String differentHostUrl = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2).replace(
"localhost", "127.0.0.1");
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadUrl(differentHostUrl);
- }
- });
- waitForUiThreadDone();
+ mOnUiThread.loadUrlAndWaitForCompletion(differentHostUrl);
assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertEquals("Second page", mWebView.getTitle());
- }
- });
+ assertEquals("Second page", mOnUiThread.getTitle());
}
@TestTargetNew(
@@ -2427,31 +2069,23 @@
args = {View.class, Rect.class, boolean.class}
)
public void testRequestChildRectangleOnScreen() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- DisplayMetrics metrics = mWebView.getContext().getResources().getDisplayMetrics();
- final int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
- String p = "<p style=\"height:" + dimension + "px;width:" + dimension + "px\"> </p>";
- mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
- waitForLoadComplete();
- }
- });
+ DisplayMetrics metrics = mOnUiThread.getDisplayMetrics();
+ int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
+ String p = "<p style=\"height:" + dimension + "px;width:" + dimension + "px\"> </p>";
+ mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
+ + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- int origX = mWebView.getScrollX();
- int origY = mWebView.getScrollY();
+ int origX = mOnUiThread.getScrollX();
+ int origY = mOnUiThread.getScrollY();
- DisplayMetrics metrics = mWebView.getContext().getResources().getDisplayMetrics();
- final int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
- int half = dimension / 2;
- Rect rect = new Rect(half, half, half + 1, half + 1);
- assertTrue(mWebView.requestChildRectangleOnScreen(mWebView, rect, true));
- assertTrue(mWebView.getScrollX() > origX);
- assertTrue(mWebView.getScrollY() > origY);
- }
- });
+ metrics = mOnUiThread.getDisplayMetrics();
+ dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
+ int half = dimension / 2;
+ Rect rect = new Rect(half, half, half + 1, half + 1);
+ assertTrue(mOnUiThread.requestChildRectangleOnScreen(mWebView, rect, true));
+ assertTrue(mOnUiThread.getScrollX() > origX);
+ assertTrue(mOnUiThread.getScrollY() > origY);
}
@TestTargets({
@@ -2475,6 +2109,7 @@
public String contentDisposition;
public boolean called;
+ @Override
public void onDownloadStart(String url, String userAgent, String contentDisposition,
String mimetype, long contentLength) {
this.called = true;
@@ -2492,29 +2127,21 @@
startWebServer(false);
final String url = mWebServer.getBinaryUrl(mimeType, length);
- runTestOnUiThread(new Runnable() {
- public void run() {
- // By default, WebView sends an intent to ask the system to
- // handle loading a new URL. We set WebViewClient as
- // WebViewClient.shouldOverrideUrlLoading() returns false, so
- // the WebView will load the new URL.
- mWebView.setWebViewClient(new WebViewClient());
- mWebView.setDownloadListener(listener);
- mWebView.loadData("<html><body><a href=\"" + url + "\">link</a></body></html>",
- "text/html", null);
- waitForLoadComplete();
- }
- });
+ // By default, WebView sends an intent to ask the system to
+ // handle loading a new URL. We set WebViewClient as
+ // WebViewClient.shouldOverrideUrlLoading() returns false, so
+ // the WebView will load the new URL.
+ mOnUiThread.setDownloadListener(listener);
+ mOnUiThread.loadDataAndWaitForCompletion(
+ "<html><body><a href=\"" + url
+ + "\">link</a></body></html>",
+ "text/html", null);
// Wait for layout to complete before setting focus.
getInstrumentation().waitForIdleSync();
- runTestOnUiThread(new Runnable() {
- public void run() {
- assertTrue(mWebView.requestFocus(View.FOCUS_DOWN, null));
- }
- });
+ assertTrue(mOnUiThread.requestFocus(View.FOCUS_DOWN, null));
getInstrumentation().waitForIdleSync();
getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return listener.called;
@@ -2562,17 +2189,15 @@
settings.setJavaScriptEnabled(true);
startWebServer(false);
String url = mWebServer.getAssetUrl(TestHtmlConstants.NETWORK_STATE_URL);
- assertLoadUrlSuccessfully(url);
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
assertEquals("ONLINE", mWebView.getTitle());
mWebView.setNetworkAvailable(false);
- mWebView.reload();
- waitForLoadComplete();
+ mOnUiThread.reloadAndWaitForCompletion();
assertEquals("OFFLINE", mWebView.getTitle());
mWebView.setNetworkAvailable(true);
- mWebView.reload();
- waitForLoadComplete();
+ mOnUiThread.reloadAndWaitForCompletion();
assertEquals("ONLINE", mWebView.getTitle());
}
@@ -2582,8 +2207,13 @@
args = {WebChromeClient.class}
)
public void testSetWebChromeClient() throws Throwable {
- final class MockWebChromeClient extends WebChromeClient {
+ final class MockWebChromeClient extends WaitForProgressClient {
private boolean mOnProgressChanged = false;
+
+ public MockWebChromeClient() {
+ super(mOnUiThread);
+ }
+
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
@@ -2596,24 +2226,16 @@
final MockWebChromeClient webChromeClient = new MockWebChromeClient();
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.setWebChromeClient(webChromeClient);
- }
- });
+ mOnUiThread.setWebChromeClient(webChromeClient);
getInstrumentation().waitForIdleSync();
assertFalse(webChromeClient.onProgressChangedCalled());
startWebServer(false);
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadUrl(url);
- }
- });
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
getInstrumentation().waitForIdleSync();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.onProgressChangedCalled();
@@ -2658,34 +2280,30 @@
}
};
final Monitor monitor = new Monitor();
- final String updateMonitorHtml = "<html><head></head>" +
+ final String updateMonitorHtml = "<html>" +
"<body onload=\"monitor.update();\"></body></html>";
// Test that JavaScript is executed even with timers paused.
runTestOnUiThread(new Runnable() {
+ @Override
public void run() {
mWebView.getSettings().setJavaScriptEnabled(true);
mWebView.addJavascriptInterface(monitor, "monitor");
mWebView.pauseTimers();
- mWebView.loadData(updateMonitorHtml, "text/html", null);
+ mOnUiThread.loadDataAndWaitForCompletion(updateMonitorHtml,
+ "text/html", null);
}
});
assertTrue(monitor.waitForUpdate());
// Start a timer and test that it does not fire.
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.loadUrl("javascript:setTimeout(function(){monitor.update();},100)");
- }
- });
+ mOnUiThread.loadDataAndWaitForCompletion(
+ "<html><body onload='setTimeout(function(){monitor.update();},100)'>" +
+ "</body></html>", "text/html", null);
assertFalse(monitor.waitForUpdate());
// Resume timers and test that the timer fires.
- runTestOnUiThread(new Runnable() {
- public void run() {
- mWebView.resumeTimers();
- }
- });
+ mOnUiThread.resumeTimers();
assertTrue(monitor.waitForUpdate());
}
@@ -2827,25 +2445,9 @@
Thread.sleep(500);
}
- private final class ScrollRunnable implements Runnable {
- private int mScrollX;
- private int mScrollY;
- @Override
- public void run() {
- mScrollX = mWebView.getScrollX();
- mScrollY = mWebView.getScrollY();
- }
- public int getScrollX() {
- return mScrollX;
- }
- public int getScrollY() {
- return mScrollY;
- }
- }
-
- private void delayedCheckWebBackForwardList(final String currUrl, final int currIndex,
+ private void pollingCheckWebBackForwardList(final String currUrl, final int currIndex,
final int size) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
WebBackForwardList list = mWebView.copyBackForwardList();
@@ -2935,56 +2537,13 @@
return true;
}
- private void assertLoadUrlSuccessfully(String url) {
- mWebView.loadUrl(url);
- waitForLoadComplete();
- }
-
- private void waitForLoadComplete() {
- new DelayedCheck(TEST_TIMEOUT) {
- @Override
- protected boolean check() {
- return mWebView.getProgress() == 100;
- }
- }.run();
- try {
- Thread.sleep(TIME_FOR_LAYOUT);
- } catch (InterruptedException e) {
- Log.w(LOGTAG, "waitForLoadComplete() interrupted while sleeping for layout delay.");
- }
- }
-
- private synchronized void notifyUiThreadDone() {
- mIsUiThreadDone = true;
- notify();
- }
-
- private synchronized void waitForUiThreadDone() throws InterruptedException {
- while (!mIsUiThreadDone) {
- try {
- wait(TEST_TIMEOUT);
- } catch (InterruptedException e) {
- continue;
- }
- if (!mIsUiThreadDone) {
- Assert.fail("Unexpected timeout");
- }
- }
- }
-
- final class LoadCompleteWebChromeClient extends WebChromeClient {
- @Override
- public void onProgressChanged(WebView webView, int progress) {
- super.onProgressChanged(webView, progress);
- if (progress == 100) {
- notifyUiThreadDone();
- }
- }
- }
-
// Note that this class is not thread-safe.
- final class SslErrorWebViewClient extends WebViewClient {
+ final class SslErrorWebViewClient extends WaitForLoadedClient {
private boolean mWasOnReceivedSslErrorCalled;
+
+ public SslErrorWebViewClient() {
+ super(mOnUiThread);
+ }
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
mWasOnReceivedSslErrorCalled = true;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java b/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
index c4f3a6c..bbe1fd3 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
@@ -16,15 +16,16 @@
package android.webkit.cts;
+import android.test.AndroidTestCase;
+import android.test.UiThreadTest;
+import android.webkit.WebView;
+import android.webkit.WebView.WebViewTransport;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.test.AndroidTestCase;
-import android.webkit.WebView;
-import android.webkit.WebView.WebViewTransport;
-
@TestTargetClass(WebViewTransport.class)
public class WebView_WebViewTransportTest extends AndroidTestCase {
@TestTargets({
@@ -39,6 +40,7 @@
args = {}
)
})
+ @UiThreadTest
public void testAccessWebView() {
WebView webView = new WebView(mContext);
WebViewTransport transport = webView.new WebViewTransport();
diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk
index a35120e..628935c 100644
--- a/tests/tests/widget/Android.mk
+++ b/tests/tests/widget/Android.mk
@@ -31,5 +31,4 @@
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-include $(BUILD_PACKAGE)
-
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index 9627b6f..e2dd2fd 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -19,6 +19,7 @@
import java.io.File;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.DataSetObserver;
@@ -29,7 +30,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.animation.cts.DelayedCheck;
import android.widget.CursorAdapter;
import android.widget.Filter;
import android.widget.FilterQueryProvider;
@@ -428,7 +428,7 @@
assertFalse(mMockCursorAdapter.hasContentChanged());
// insert a new row
mDatabase.execSQL("INSERT INTO test (number) VALUES ('" + FIRST_NUMBER + "');");
- new DelayedCheck(TEST_TIME_OUT) {
+ new PollingCheck(TEST_TIME_OUT) {
@Override
protected boolean check() {
return mMockCursorAdapter.hasContentChanged();
diff --git a/tests/tests/widget/src/android/widget/cts/FilterTest.java b/tests/tests/widget/src/android/widget/cts/FilterTest.java
index 862cb03..1306bd2 100644
--- a/tests/tests/widget/src/android/widget/cts/FilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FilterTest.java
@@ -20,8 +20,8 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.widget.Filter;
import android.widget.Filter.FilterListener;
@@ -70,7 +70,7 @@
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPerformedFiltering();
@@ -78,7 +78,7 @@
}.run();
assertEquals(TEST_CONSTRAINT, mMockFilter.getPerformFilteringConstraint());
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPublishedResults();
@@ -102,7 +102,7 @@
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPerformedFiltering();
@@ -110,7 +110,7 @@
}.run();
assertEquals(TEST_CONSTRAINT, mMockFilter.getPerformFilteringConstraint());
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPublishedResults();
@@ -119,7 +119,7 @@
assertEquals(TEST_CONSTRAINT, mMockFilter.getPublishResultsConstraint());
assertSame(mMockFilter.getExpectResults(), mMockFilter.getResults());
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mockFilterListener.hasCalledOnFilterComplete();
diff --git a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
index 31b0b7b..c6302f9 100644
--- a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
@@ -28,6 +28,7 @@
import android.app.Activity;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
@@ -39,7 +40,6 @@
import android.view.ViewGroup;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
-import android.view.animation.cts.DelayedCheck;
import android.widget.HorizontalScrollView;
import android.widget.TextView;
@@ -363,7 +363,7 @@
mScrollView.fullScroll(View.FOCUS_RIGHT);
}
});
- delayedCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
+ pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
runTestOnUiThread(new Runnable() {
@@ -371,7 +371,7 @@
mScrollView.fullScroll(View.FOCUS_LEFT);
}
});
- delayedCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
+ pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
assertEquals(0, mScrollView.getScrollX());
}
@@ -521,7 +521,7 @@
mScrollView.smoothScrollBy(SCROLL_RIGHT, 0);
}
});
- delayedCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
+ pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
@@ -530,7 +530,7 @@
mScrollView.smoothScrollBy(-SCROLL_RIGHT, 0);
}
});
- delayedCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
+ pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
assertEquals(0, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
}
@@ -549,7 +549,7 @@
mScrollView.smoothScrollTo(SCROLL_RIGHT, 0);
}
});
- delayedCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
+ pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
@@ -558,7 +558,7 @@
mScrollView.smoothScrollTo(0, 0);
}
});
- delayedCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
+ pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
assertEquals(0, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
}
@@ -677,7 +677,7 @@
mScrollView.fling(velocityX);
}
});
- delayedCheckFling(0, true);
+ pollingCheckFling(0, true);
final int currentX = mScrollView.getScrollX();
// fling towards left
@@ -686,7 +686,7 @@
mScrollView.fling(-velocityX);
}
});
- delayedCheckFling(currentX, false);
+ pollingCheckFling(currentX, false);
}
@TestTargetNew(
@@ -832,7 +832,7 @@
return current <= from && current >= to;
}
- private void delayedCheckSmoothScrolling(final int fromX, final int toX,
+ private void pollingCheckSmoothScrolling(final int fromX, final int toX,
final int fromY, final int toY) {
if (fromX == toX && fromY == toY) {
@@ -840,7 +840,7 @@
}
if (fromY != toY) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollY(), fromY, toY);
@@ -849,7 +849,7 @@
}
if (fromX != toX) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollX(), fromX, toX);
@@ -857,7 +857,7 @@
}.run();
}
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return toX == mScrollView.getScrollX() && toY == mScrollView.getScrollY();
@@ -865,8 +865,8 @@
}.run();
}
- private void delayedCheckFling(final int startPosition, final boolean movingRight) {
- new DelayedCheck() {
+ private void pollingCheckFling(final int startPosition, final boolean movingRight) {
+ new PollingCheck() {
@Override
protected boolean check() {
if (movingRight) {
@@ -876,7 +876,7 @@
}
}.run();
- new DelayedCheck() {
+ new PollingCheck() {
private int mPreviousScrollX = mScrollView.getScrollX();
@Override
diff --git a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
index 9f27138..dc007e4 100644
--- a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
@@ -29,6 +29,7 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.util.AttributeSet;
@@ -36,7 +37,6 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.animation.cts.DelayedCheck;
import android.widget.MediaController;
import android.widget.VideoView;
@@ -222,7 +222,7 @@
assertTrue(mMediaController.isShowing());
// isShowing() should return false, but MediaController still shows, this may be a bug.
- new DelayedCheck(timeout + 500) {
+ new PollingCheck(timeout + 500) {
@Override
protected boolean check() {
return mMediaController.isShowing();
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
index 681e641..cd336da 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
@@ -28,6 +28,7 @@
import android.app.Activity;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
@@ -39,7 +40,6 @@
import android.view.ViewGroup;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -382,7 +382,7 @@
mScrollView.fullScroll(View.FOCUS_DOWN);
}
});
- delayedCheckSmoothScrolling(0, 0, 0, mScrollBottom);
+ pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
assertEquals(mScrollBottom, mScrollView.getScrollY(), TOLERANCE);
runTestOnUiThread(new Runnable() {
@@ -390,7 +390,7 @@
mScrollView.fullScroll(View.FOCUS_UP);
}
});
- delayedCheckSmoothScrolling(0, 0, mScrollBottom, 0);
+ pollingCheckSmoothScrolling(0, 0, mScrollBottom, 0);
assertEquals(0, mScrollView.getScrollY());
}
@@ -547,7 +547,7 @@
}
});
// smoothScrollBy doesn't scroll in X
- delayedCheckSmoothScrolling(0, 0, 0, mScrollBottom);
+ pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
assertEquals(0, mScrollView.getScrollX());
assertEquals(mScrollBottom, mScrollView.getScrollY());
@@ -556,7 +556,7 @@
mScrollView.smoothScrollBy(-mScrollRight, -mScrollBottom);
}
});
- delayedCheckSmoothScrolling(mScrollRight, 0, mScrollBottom, 0);
+ pollingCheckSmoothScrolling(mScrollRight, 0, mScrollBottom, 0);
assertEquals(0, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
}
@@ -576,7 +576,7 @@
}
});
// smoothScrollTo doesn't scroll in X
- delayedCheckSmoothScrolling(0, 0, 0, mScrollBottom);
+ pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
assertEquals(0, mScrollView.getScrollX());
assertEquals(mScrollBottom, mScrollView.getScrollY());
@@ -585,7 +585,7 @@
mScrollView.smoothScrollTo(mPageWidth, mPageHeight);
}
});
- delayedCheckSmoothScrolling(0, 0, mScrollBottom, mPageHeight);
+ pollingCheckSmoothScrolling(0, 0, mScrollBottom, mPageHeight);
assertEquals(0, mScrollView.getScrollX());
assertEquals(mPageHeight, mScrollView.getScrollY());
}
@@ -706,7 +706,7 @@
mScrollView.fling(2000);
}
});
- delayedCheckFling(0, true);
+ pollingCheckFling(0, true);
final int currentY = mScrollView.getScrollY();
// fling towards top
@@ -715,7 +715,7 @@
mScrollView.fling(-2000);
}
});
- delayedCheckFling(currentY, false);
+ pollingCheckFling(currentY, false);
}
@TestTargetNew(
@@ -860,7 +860,7 @@
return current <= from && current >= to;
}
- private void delayedCheckSmoothScrolling(final int fromX, final int toX,
+ private void pollingCheckSmoothScrolling(final int fromX, final int toX,
final int fromY, final int toY) {
if (fromX == toX && fromY == toY) {
@@ -868,7 +868,7 @@
}
if (fromY != toY) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollY(), fromY, toY);
@@ -877,7 +877,7 @@
}
if (fromX != toX) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollX(), fromX, toX);
@@ -885,7 +885,7 @@
}.run();
}
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return toX == mScrollView.getScrollX() && toY == mScrollView.getScrollY();
@@ -893,8 +893,8 @@
}.run();
}
- private void delayedCheckFling(final int startPosition, final boolean movingDown) {
- new DelayedCheck() {
+ private void pollingCheckFling(final int startPosition, final boolean movingDown) {
+ new PollingCheck() {
@Override
protected boolean check() {
if (movingDown) {
@@ -904,7 +904,7 @@
}
};
- new DelayedCheck() {
+ new PollingCheck() {
private int mPreviousScrollY = mScrollView.getScrollY();
@Override
diff --git a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
index 3207a15..70310de 100644
--- a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
@@ -28,13 +28,13 @@
import android.app.Activity;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.util.AttributeSet;
import android.util.Xml;
import android.view.MotionEvent;
import android.view.View;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ImageView;
import android.widget.SlidingDrawer;
import android.widget.TextView;
@@ -192,7 +192,7 @@
assertFalse(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
@@ -210,7 +210,7 @@
assertTrue(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
@@ -253,7 +253,7 @@
assertFalse(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
@@ -271,7 +271,7 @@
assertTrue(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index c714d8a..dcf574c 100755
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -35,6 +35,7 @@
import android.content.Intent;
import android.content.res.ColorStateList;
import android.content.res.Resources.NotFoundException;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Paint;
@@ -86,7 +87,6 @@
import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnCreateContextMenuListener;
import android.view.View.OnLongClickListener;
-import android.view.animation.cts.DelayedCheck;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.ExtractedText;
@@ -2580,7 +2580,7 @@
mInstrumentation.waitForIdleSync();
// it will get transformed after a while
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
// "******"
@@ -3432,7 +3432,7 @@
// wait for the marquee to run
// fading is shown on both sides if the marquee runs for a while
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
return textView.getLeftFadingEdgeStrength() > 0.0f
@@ -3446,7 +3446,7 @@
// wait for the marquee to continue
// the left fading becomes thicker while the right fading becomes thiner
// as the text moves towards left
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
return leftFadingEdgeStrength < textView.getLeftFadingEdgeStrength()
diff --git a/tests/tests/widget/src/android/widget/cts/ToastTest.java b/tests/tests/widget/src/android/widget/cts/ToastTest.java
index c54b205..c5f1c9f 100644
--- a/tests/tests/widget/src/android/widget/cts/ToastTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToastTest.java
@@ -26,6 +26,7 @@
import android.app.Activity;
import android.app.Instrumentation;
+import android.cts.util.PollingCheck;
import android.graphics.drawable.Drawable;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
@@ -33,7 +34,6 @@
import android.view.Gravity;
import android.view.View;
import android.view.WindowManager;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ImageView;
import android.widget.Toast;
@@ -78,7 +78,7 @@
}
private void assertShowToast(final View view) {
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return null != view.getParent();
@@ -88,7 +88,7 @@
private void assertShowAndHide(final View view) {
assertShowToast(view);
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return null == view.getParent();
diff --git a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
index 57ea598..6b3cc4e 100644
--- a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
@@ -26,13 +26,13 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnPreparedListener;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View.MeasureSpec;
-import android.view.animation.cts.DelayedCheck;
import android.widget.MediaController;
import android.widget.VideoView;
@@ -214,7 +214,7 @@
mVideoView.setVideoPath(mVideoPath);
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return preparedListener.isTriggered();
@@ -228,7 +228,7 @@
}
});
// wait time is longer than duration in case system is sluggish
- new DelayedCheck(mVideoView.getDuration() + TIME_OUT) {
+ new PollingCheck(mVideoView.getDuration() + TIME_OUT) {
@Override
protected boolean check() {
return completionListener.isTriggered();
@@ -254,7 +254,7 @@
});
mInstrumentation.waitForIdleSync();
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return listener.isTriggered();
@@ -278,7 +278,7 @@
});
mInstrumentation.waitForIdleSync();
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return prepareListener.isTriggered();
diff --git a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
index 4bb412c..f98528a 100644
--- a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
@@ -27,13 +27,13 @@
import org.xmlpull.v1.XmlPullParser;
import android.app.Activity;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.util.AttributeSet;
import android.util.Xml;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ListView;
import android.widget.ZoomButton;
@@ -157,7 +157,7 @@
assertFalse(listener.hasOnClickCalled());
mZoomButton.performLongClick();
- new DelayedCheck(speed + 500) {
+ new PollingCheck(speed + 500) {
@Override
protected boolean check() {
return listener.hasOnClickCalled();
diff --git a/tests/vm-tests/AndroidManifest.xml b/tests/vm-tests/AndroidManifest.xml
deleted file mode 100644
index ffd5a93..0000000
--- a/tests/vm-tests/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.core.vm-tests">
- <uses-permission android:name="android.permission.INTERNET" />
- <application>
- <uses-library android:name="android.test.runner" />
- </application>
-
- <instrumentation android:name="android.test.InstrumentationCoreTestRunner"
- android:targetPackage="android.core.vm-tests"
- android:label="cts framework tests"/>
-
-</manifest>
diff --git a/tools/build/test_executable.mk b/tools/build/test_executable.mk
index bfd5bee..8b445a3 100644
--- a/tools/build/test_executable.mk
+++ b/tools/build/test_executable.mk
@@ -25,14 +25,18 @@
include $(BUILD_EXECUTABLE)
-cts_executable_xml := $(CTS_NATIVE_XML_OUT)/$(LOCAL_MODULE).xml
+cts_executable_xml := $(CTS_TESTCASES_OUT)/$(LOCAL_MODULE).xml
$(cts_executable_xml): PRIVATE_PATH := $(LOCAL_PATH)
$(cts_executable_xml): PRIVATE_TEST_PACKAGE := $(LOCAL_CTS_TEST_PACKAGE)
$(cts_executable_xml): PRIVATE_EXECUTABLE := $(LOCAL_MODULE)
-$(cts_executable_xml): $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES)) | $(CTS_NATIVE_XML_GENERATOR)
+$(cts_executable_xml): $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES)) $(CTS_EXPECTATIONS) $(CTS_NATIVE_TEST_SCANNER) $(CTS_XML_GENERATOR)
$(hide) echo Generating test description for native package $(PRIVATE_TEST_PACKAGE)
- $(hide) $(CTS_NATIVE_XML_GENERATOR) -p $(PRIVATE_TEST_PACKAGE) \
- -n $(PRIVATE_EXECUTABLE) \
- -s $(PRIVATE_PATH) \
- -o $@
+ $(hide) mkdir -p $(CTS_TESTCASES_OUT)
+ $(hide) $(CTS_NATIVE_TEST_SCANNER) -s $(PRIVATE_PATH) \
+ -t $(PRIVATE_TEST_PACKAGE) | \
+ $(CTS_XML_GENERATOR) -t native \
+ -n $(PRIVATE_EXECUTABLE) \
+ -p $(PRIVATE_TEST_PACKAGE) \
+ -e $(CTS_EXPECTATIONS) \
+ -o $@
diff --git a/tools/build/test_host_java_library.mk b/tools/build/test_host_java_library.mk
new file mode 100644
index 0000000..9512bfa
--- /dev/null
+++ b/tools/build/test_host_java_library.mk
@@ -0,0 +1,38 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Builds a host library and defines a rule to generate the associated test
+# package XML needed by CTS.
+#
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+cts_library_xml := $(CTS_TESTCASES_OUT)/$(LOCAL_MODULE).xml
+
+$(cts_library_xml): PRIVATE_PATH := $(LOCAL_PATH)/src
+$(cts_library_xml): PRIVATE_TEST_PACKAGE := $(LOCAL_CTS_TEST_PACKAGE)
+$(cts_library_xml): PRIVATE_LIBRARY := $(LOCAL_MODULE)
+$(cts_library_xml): PRIVATE_JAR_PATH := $(LOCAL_MODULE).jar
+$(cts_library_xml): $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE).jar $(CTS_EXPECTATIONS) $(CTS_JAVA_TEST_SCANNER_DOCLET) $(CTS_JAVA_TEST_SCANNER) $(CTS_XML_GENERATOR)
+ $(hide) echo Generating test description for host library $(PRIVATE_LIBRARY)
+ $(hide) mkdir -p $(CTS_TESTCASES_OUT)
+ $(hide) $(CTS_JAVA_TEST_SCANNER) -s $(PRIVATE_PATH) \
+ -d $(CTS_JAVA_TEST_SCANNER_DOCLET) | \
+ $(CTS_XML_GENERATOR) -t hostSideOnly \
+ -j $(PRIVATE_JAR_PATH) \
+ -n $(PRIVATE_LIBRARY) \
+ -p $(PRIVATE_TEST_PACKAGE) \
+ -e $(CTS_EXPECTATIONS) \
+ -o $@
diff --git a/tools/build/test_package.mk b/tools/build/test_package.mk
new file mode 100644
index 0000000..1cf4ecc
--- /dev/null
+++ b/tools/build/test_package.mk
@@ -0,0 +1,47 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Builds a package and defines a rule to generate the associated test
+# package XML needed by CTS.
+#
+# Replace "include $(BUILD_PACKAGE)" with "include $(BUILD_CTS_PACKAGE)"
+#
+
+include $(BUILD_PACKAGE)
+
+cts_package_apk := $(CTS_TESTCASES_OUT)/$(LOCAL_PACKAGE_NAME).apk
+cts_package_xml := $(CTS_TESTCASES_OUT)/$(LOCAL_PACKAGE_NAME).xml
+
+$(cts_package_apk): PRIVATE_PACKAGE := $(LOCAL_PACKAGE_NAME)
+$(cts_package_apk): $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/package.apk | $(ACP)
+ $(hide) mkdir -p $(CTS_TESTCASES_OUT)
+ $(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(PRIVATE_PACKAGE))/package.apk $@
+
+$(cts_package_xml): PRIVATE_PATH := $(LOCAL_PATH)
+$(cts_package_xml): PRIVATE_INSTRUMENTATION := $(LOCAL_INSTRUMENTATION_FOR)
+$(cts_package_xml): PRIVATE_PACKAGE := $(LOCAL_PACKAGE_NAME)
+$(cts_package_xml): PRIVATE_TEST_PACKAGE := android.$(notdir $(LOCAL_PATH))
+$(cts_package_xml): PRIVATE_MANIFEST := $(LOCAL_PATH)/AndroidManifest.xml
+$(cts_package_xml): $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/package.apk $(CTS_EXPECTATIONS) $(CTS_JAVA_TEST_SCANNER_DOCLET) $(CTS_JAVA_TEST_SCANNER) $(CTS_XML_GENERATOR)
+ $(hide) echo Generating test description for java package $(PRIVATE_PACKAGE)
+ $(hide) mkdir -p $(CTS_TESTCASES_OUT)
+ $(hide) $(CTS_JAVA_TEST_SCANNER) -s $(PRIVATE_PATH) \
+ -d $(CTS_JAVA_TEST_SCANNER_DOCLET) | \
+ $(CTS_XML_GENERATOR) -m $(PRIVATE_MANIFEST) \
+ -i "$(PRIVATE_INSTRUMENTATION)" \
+ -n $(PRIVATE_PACKAGE) \
+ -p $(PRIVATE_TEST_PACKAGE) \
+ -e $(CTS_EXPECTATIONS) \
+ -o $@
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java
index de2e3eb..101be7f 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java
@@ -26,22 +26,31 @@
private final String mName;
+ private final boolean mDeprecated;
+
private final List<ApiConstructor> mApiConstructors = new ArrayList<ApiConstructor>();
private final List<ApiMethod> mApiMethods = new ArrayList<ApiMethod>();
- ApiClass(String name) {
- this.mName = name;
+ ApiClass(String name, boolean deprecated) {
+ mName = name;
+ mDeprecated = deprecated;
}
+ @Override
public int compareTo(ApiClass another) {
return mName.compareTo(another.mName);
}
+ @Override
public String getName() {
return mName;
}
+ public boolean isDeprecated() {
+ return mDeprecated;
+ }
+
public void addConstructor(ApiConstructor constructor) {
mApiConstructors.add(constructor);
}
@@ -97,6 +106,7 @@
return mApiConstructors.size() + mApiMethods.size();
}
+ @Override
public float getCoveragePercentage() {
return (float) getNumCoveredMethods() / getTotalMethods() * 100;
}
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiConstructor.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiConstructor.java
index b38bd34..8d721e6 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiConstructor.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiConstructor.java
@@ -27,13 +27,17 @@
private final List<String> mParameterTypes;
+ private final boolean mDeprecated;
+
private boolean mIsCovered;
- ApiConstructor(String name, List<String> parameterTypes) {
- this.mName = name;
- this.mParameterTypes = new ArrayList<String>(parameterTypes);
+ ApiConstructor(String name, List<String> parameterTypes, boolean deprecated) {
+ mName = name;
+ mParameterTypes = new ArrayList<String>(parameterTypes);
+ mDeprecated = deprecated;
}
+ @Override
public int compareTo(ApiConstructor another) {
return mParameterTypes.size() - another.mParameterTypes.size();
}
@@ -46,6 +50,10 @@
return Collections.unmodifiableList(mParameterTypes);
}
+ public boolean isDeprecated() {
+ return mDeprecated;
+ }
+
public boolean isCovered() {
return mIsCovered;
}
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiMethod.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiMethod.java
index eb67b8e..053cd12 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiMethod.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiMethod.java
@@ -29,14 +29,18 @@
private final String mReturnType;
+ private boolean mDeprecated;
+
private boolean mIsCovered;
- ApiMethod(String name, List<String> parameterTypes, String returnType) {
- this.mName = name;
- this.mParameterTypes = new ArrayList<String>(parameterTypes);
- this.mReturnType = returnType;
+ ApiMethod(String name, List<String> parameterTypes, String returnType, boolean deprecated) {
+ mName = name;
+ mParameterTypes = new ArrayList<String>(parameterTypes);
+ mReturnType = returnType;
+ mDeprecated = deprecated;
}
+ @Override
public int compareTo(ApiMethod another) {
return mName.compareTo(another.mName);
}
@@ -53,6 +57,10 @@
return mReturnType;
}
+ public boolean isDeprecated() {
+ return mDeprecated;
+ }
+
public boolean isCovered() {
return mIsCovered;
}
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiPackage.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiPackage.java
index f0ca889..ddc6fb4 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiPackage.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiPackage.java
@@ -29,9 +29,10 @@
private final Map<String, ApiClass> mApiClassMap = new HashMap<String, ApiClass>();
ApiPackage(String name) {
- this.mName = name;
+ mName = name;
}
+ @Override
public String getName() {
return mName;
}
@@ -64,6 +65,7 @@
return total;
}
+ @Override
public float getCoveragePercentage() {
return (float) getNumCoveredMethods() / getTotalMethods() * 100;
}
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/CurrentXmlHandler.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/CurrentXmlHandler.java
index 41ee0dc..f3abd86 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/CurrentXmlHandler.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/CurrentXmlHandler.java
@@ -36,6 +36,8 @@
private String mCurrentMethodReturnType;
+ private boolean mDeprecated;
+
private List<String> mCurrentParameterTypes = new ArrayList<String>();
private ApiCoverage mApiCoverage = new ApiCoverage();
@@ -49,27 +51,30 @@
throws SAXException {
super.startElement(uri, localName, name, attributes);
if ("package".equalsIgnoreCase(localName)) {
- mCurrentPackageName = CurrentXmlHandler.getValue(attributes, "name");
+ mCurrentPackageName = getValue(attributes, "name");
ApiPackage apiPackage = new ApiPackage(mCurrentPackageName);
mApiCoverage.addPackage(apiPackage);
} else if ("class".equalsIgnoreCase(localName)
|| "interface".equalsIgnoreCase(localName)) {
- mCurrentClassName = CurrentXmlHandler.getValue(attributes, "name");
+ mCurrentClassName = getValue(attributes, "name");
+ mDeprecated = isDeprecated(attributes);
- ApiClass apiClass = new ApiClass(mCurrentClassName);
+ ApiClass apiClass = new ApiClass(mCurrentClassName, mDeprecated);
ApiPackage apiPackage = mApiCoverage.getPackage(mCurrentPackageName);
apiPackage.addClass(apiClass);
} else if ("constructor".equalsIgnoreCase(localName)) {
+ mDeprecated = isDeprecated(attributes);
mCurrentParameterTypes.clear();
} else if ("method".equalsIgnoreCase(localName)) {
- mCurrentMethodName = CurrentXmlHandler.getValue(attributes, "name");
- mCurrentMethodReturnType = CurrentXmlHandler.getValue(attributes, "return");
+ mDeprecated = isDeprecated(attributes);
+ mCurrentMethodName = getValue(attributes, "name");
+ mCurrentMethodReturnType = getValue(attributes, "return");
mCurrentParameterTypes.clear();
} else if ("parameter".equalsIgnoreCase(localName)) {
- mCurrentParameterTypes.add(CurrentXmlHandler.getValue(attributes, "type"));
+ mCurrentParameterTypes.add(getValue(attributes, "type"));
}
}
@@ -77,14 +82,18 @@
public void endElement(String uri, String localName, String name) throws SAXException {
super.endElement(uri, localName, name);
if ("constructor".equalsIgnoreCase(localName)) {
+ if (mCurrentParameterTypes.isEmpty()) {
+ // Don't add empty default constructors...
+ return;
+ }
ApiConstructor apiConstructor = new ApiConstructor(mCurrentClassName,
- mCurrentParameterTypes);
+ mCurrentParameterTypes, mDeprecated);
ApiPackage apiPackage = mApiCoverage.getPackage(mCurrentPackageName);
ApiClass apiClass = apiPackage.getClass(mCurrentClassName);
apiClass.addConstructor(apiConstructor);
} else if ("method".equalsIgnoreCase(localName)) {
ApiMethod apiMethod = new ApiMethod(mCurrentMethodName, mCurrentParameterTypes,
- mCurrentMethodReturnType);
+ mCurrentMethodReturnType, mDeprecated);
ApiPackage apiPackage = mApiCoverage.getPackage(mCurrentPackageName);
ApiClass apiClass = apiPackage.getClass(mCurrentClassName);
apiClass.addMethod(apiMethod);
@@ -97,4 +106,8 @@
.replaceAll("<.+>", "")
.replace("$", ".");
}
+
+ private boolean isDeprecated(Attributes attributes) {
+ return "deprecated".equals(attributes.getValue("deprecated"));
+ }
}
\ No newline at end of file
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/HtmlReport.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/HtmlReport.java
index de9b7a6..9243fe0 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/HtmlReport.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/HtmlReport.java
@@ -37,11 +37,12 @@
class HtmlReport {
public static void printHtmlReport(final List<File> testApks, final ApiCoverage apiCoverage,
- final OutputStream out) throws IOException, TransformerException, InterruptedException {
+ final OutputStream out) throws IOException, TransformerException {
final PipedOutputStream xmlOut = new PipedOutputStream();
final PipedInputStream xmlIn = new PipedInputStream(xmlOut);
Thread t = new Thread(new Runnable() {
+ @Override
public void run() {
XmlReport.printXmlReport(testApks, apiCoverage, xmlOut);
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/XmlReport.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/XmlReport.java
index 68acf06..94ccbb4 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/XmlReport.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/XmlReport.java
@@ -72,12 +72,14 @@
out.println("<class name=\"" + apiClass.getName()
+ "\" numCovered=\"" + apiClass.getNumCoveredMethods()
+ "\" numTotal=\"" + apiClass.getTotalMethods()
+ + "\" deprecated=\"" + apiClass.isDeprecated()
+ "\" coveragePercentage=\""
+ Math.round(apiClass.getCoveragePercentage())
+ "\">");
for (ApiConstructor constructor : apiClass.getConstructors()) {
out.println("<constructor name=\"" + constructor.getName()
+ + "\" deprecated=\"" + constructor.isDeprecated()
+ "\" covered=\"" + constructor.isCovered() + "\">");
for (String parameterType : constructor.getParameterTypes()) {
@@ -90,6 +92,7 @@
for (ApiMethod method : apiClass.getMethods()) {
out.println("<method name=\"" + method.getName()
+ "\" returnType=\"" + method.getReturnType()
+ + "\" deprecated=\"" + method.isDeprecated()
+ "\" covered=\"" + method.isCovered() + "\">");
for (String parameterType : method.getParameterTypes()) {
diff --git a/tools/cts-api-coverage/src/res/api-coverage.xsl b/tools/cts-api-coverage/src/res/api-coverage.xsl
index 91fe802..95994e2 100644
--- a/tools/cts-api-coverage/src/res/api-coverage.xsl
+++ b/tools/cts-api-coverage/src/res/api-coverage.xsl
@@ -61,15 +61,19 @@
}
.red {
- background-color: #FF0000;
+ background-color: #FF6666;
}
.yellow {
- background-color: #FFFF00;
+ background-color: #FFFF66;
}
.green {
- background-color: #00FF00;
+ background-color: #66FF66;
+ }
+
+ .deprecated {
+ text-decoration: line-through;
}
</style>
</head>
@@ -118,7 +122,7 @@
<xsl:template name="packageOrClassListItem">
<xsl:param name="bulletClass" />
-
+
<xsl:variable name="colorClass">
<xsl:choose>
<xsl:when test="@coveragePercentage <= 50">red</xsl:when>
@@ -127,8 +131,15 @@
</xsl:choose>
</xsl:variable>
+ <xsl:variable name="deprecatedClass">
+ <xsl:choose>
+ <xsl:when test="@deprecated = 'true'">deprecated</xsl:when>
+ <xsl:otherwise></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<li class="{$bulletClass}" onclick="toggleVisibility('{@name}')">
- <span class="{$colorClass}">
+ <span class="{$colorClass} {$deprecatedClass}">
<b><xsl:value-of select="@name" /></b>
<xsl:value-of select="@coveragePercentage" />%
(<xsl:value-of select="@numCovered" />/<xsl:value-of select="@numTotal" />)
@@ -137,7 +148,15 @@
</xsl:template>
<xsl:template name="methodListItem">
- <span class="method">
+
+ <xsl:variable name="deprecatedClass">
+ <xsl:choose>
+ <xsl:when test="@deprecated = 'true'">deprecated</xsl:when>
+ <xsl:otherwise></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <span class="method {$deprecatedClass}">
<xsl:choose>
<xsl:when test="@covered = 'true'">[X]</xsl:when>
<xsl:otherwise>[ ]</xsl:otherwise>
@@ -147,7 +166,7 @@
</span>
<br />
</xsl:template>
-
+
<xsl:template name="formatParameters">(<xsl:for-each select="parameter">
<xsl:value-of select="@type" />
<xsl:if test="not(position() = last())">, </xsl:if>
diff --git a/tools/cts-java-scanner-doclet/Android.mk b/tools/cts-java-scanner-doclet/Android.mk
new file mode 100644
index 0000000..51b141e
--- /dev/null
+++ b/tools/cts-java-scanner-doclet/Android.mk
@@ -0,0 +1,26 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cts-java-scanner-doclet
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_CLASSPATH := $(HOST_JDK_TOOLS_JAR) cts/tools/utils/lib/junit.jar
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-java-scanner-doclet/src/com/android/cts/javascannerdoclet/CtsJavaScannerDoclet.java b/tools/cts-java-scanner-doclet/src/com/android/cts/javascannerdoclet/CtsJavaScannerDoclet.java
new file mode 100644
index 0000000..808473a
--- /dev/null
+++ b/tools/cts-java-scanner-doclet/src/com/android/cts/javascannerdoclet/CtsJavaScannerDoclet.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.javascannerdoclet;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.sun.javadoc.AnnotationDesc;
+import com.sun.javadoc.AnnotationTypeDoc;
+import com.sun.javadoc.AnnotationValue;
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.Doclet;
+import com.sun.javadoc.MethodDoc;
+import com.sun.javadoc.RootDoc;
+import com.sun.javadoc.AnnotationDesc.ElementValuePair;
+
+/**
+ * Doclet that outputs in the following format:
+ *
+ * suite:android.holo.cts
+ * case:HoloTest
+ * test:testHolo
+ * test:testHoloDialog
+ */
+public class CtsJavaScannerDoclet extends Doclet {
+
+ static final String JUNIT_TEST_CASE_CLASS_NAME = "junit.framework.testcase";
+
+ public static boolean start(RootDoc root) {
+ ClassDoc[] classes = root.classes();
+ if (classes == null) {
+ return false;
+ }
+
+ PrintWriter writer = new PrintWriter(System.out);
+
+ for (ClassDoc clazz : classes) {
+ if (clazz.isAbstract() || !isValidJUnitTestCase(clazz)) {
+ continue;
+ }
+ writer.append("suite:").println(clazz.containingPackage().name());
+ writer.append("case:").println(clazz.name());
+ for (; clazz != null; clazz = clazz.superclass()) {
+ for (MethodDoc method : clazz.methods()) {
+ if (!method.name().startsWith("test")) {
+ continue;
+ }
+ writer.append("test:").println(method.name());
+ }
+ }
+ }
+
+ writer.close();
+ return true;
+ }
+
+ private static boolean isValidJUnitTestCase(ClassDoc clazz) {
+ while((clazz = clazz.superclass()) != null) {
+ if (JUNIT_TEST_CASE_CLASS_NAME.equals(clazz.qualifiedName().toLowerCase())) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/tools/cts-java-scanner/Android.mk b/tools/cts-java-scanner/Android.mk
new file mode 100644
index 0000000..8b6c906
--- /dev/null
+++ b/tools/cts-java-scanner/Android.mk
@@ -0,0 +1,43 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# We use copy-file-to-new-target so that the installed
+# script file's timestamp is at least as new as the
+# .jar file it wraps.
+
+# the hat script
+# ============================================================
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE := cts-java-scanner
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/$(LOCAL_MODULE) | $(ACP)
+ @echo "Copy: $(PRIVATE_MODULE) ($@)"
+ $(copy-file-to-new-target)
+ $(hide) chmod 755 $@
+
+# the other stuff
+# ============================================================
+subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
+ src \
+ ))
+
+include $(subdirs)
diff --git a/tools/cts-java-scanner/etc/cts-java-scanner b/tools/cts-java-scanner/etc/cts-java-scanner
new file mode 100644
index 0000000..378eee8
--- /dev/null
+++ b/tools/cts-java-scanner/etc/cts-java-scanner
@@ -0,0 +1,46 @@
+#!/bin/bash
+#
+# Copyright (C) 2011, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+ newProg=`/bin/ls -ld "${prog}"`
+ newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+ if expr "x${newProg}" : 'x/' >/dev/null; then
+ prog="${newProg}"
+ else
+ progdir=`dirname "${prog}"`
+ prog="${progdir}/${newProg}"
+ fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+libdir=`dirname $progdir`/framework
+
+javaOpts=""
+while expr "x$1" : 'x-J' >/dev/null; do
+ opt=`expr "$1" : '-J\(.*\)'`
+ javaOpts="${javaOpts} -${opt}"
+ shift
+done
+
+exec java $javaOpts -jar $libdir/cts-java-scanner.jar "$@"
diff --git a/tools/cts-java-scanner/src/Android.mk b/tools/cts-java-scanner/src/Android.mk
new file mode 100644
index 0000000..ec42bcf
--- /dev/null
+++ b/tools/cts-java-scanner/src/Android.mk
@@ -0,0 +1,28 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+
+# cts-java-scanner java library
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_JAR_MANIFEST := MANIFEST.mf
+
+LOCAL_MODULE := cts-java-scanner
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-java-scanner/src/MANIFEST.mf b/tools/cts-java-scanner/src/MANIFEST.mf
new file mode 100644
index 0000000..642f226
--- /dev/null
+++ b/tools/cts-java-scanner/src/MANIFEST.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.android.cts.javascanner.CtsJavaScanner
diff --git a/tools/cts-java-scanner/src/com/android/cts/javascanner/CtsJavaScanner.java b/tools/cts-java-scanner/src/com/android/cts/javascanner/CtsJavaScanner.java
new file mode 100644
index 0000000..a843fc6
--- /dev/null
+++ b/tools/cts-java-scanner/src/com/android/cts/javascanner/CtsJavaScanner.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.javascanner;
+
+import java.io.File;
+import java.util.Arrays;
+
+/**
+ * Class that searches a source directory for native gTests and outputs a
+ * list of test classes and methods.
+ */
+public class CtsJavaScanner {
+
+ private static void usage(String[] args) {
+ System.err.println("Arguments: " + Arrays.asList(args));
+ System.err.println("Usage: cts-java-scanner -s SOURCE_DIR -d DOCLET_PATH");
+ System.exit(1);
+ }
+
+ public static void main(String[] args) throws Exception {
+ File sourceDir = null;
+ File docletPath = null;
+
+ for (int i = 0; i < args.length; i++) {
+ if ("-s".equals(args[i])) {
+ sourceDir = new File(getArg(args, ++i, "Missing value for source directory"));
+ } else if ("-d".equals(args[i])) {
+ docletPath = new File(getArg(args, ++i, "Missing value for docletPath"));
+ } else {
+ System.err.println("Unsupported flag: " + args[i]);
+ usage(args);
+ }
+ }
+
+ if (sourceDir == null) {
+ System.err.println("Source directory is required");
+ usage(args);
+ }
+
+ if (docletPath == null) {
+ System.err.println("Doclet path is required");
+ usage(args);
+ }
+
+ DocletRunner runner = new DocletRunner(sourceDir, docletPath);
+ System.exit(runner.runJavaDoc());
+ }
+
+ private static String getArg(String[] args, int index, String message) {
+ if (index < args.length) {
+ return args[index];
+ } else {
+ System.err.println(message);
+ usage(args);
+ return null;
+ }
+ }
+}
diff --git a/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java b/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java
new file mode 100644
index 0000000..8a371fd
--- /dev/null
+++ b/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.javascanner;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+class DocletRunner {
+
+ private final File mSourceDir;
+ private final File mDocletPath;
+
+ DocletRunner(File sourceDir, File docletPath) {
+ mSourceDir = sourceDir;
+ mDocletPath = docletPath;
+ }
+
+ int runJavaDoc() throws IOException, InterruptedException {
+ List<String> args = new ArrayList<String>();
+ args.add("javadoc");
+ args.add("-doclet");
+ args.add("com.android.cts.javascannerdoclet.CtsJavaScannerDoclet");
+ args.add("-docletpath");
+ args.add(mDocletPath.toString());
+ args.add("-sourcepath");
+ args.add(getSourcePath(mSourceDir));
+ args.add("-classpath");
+ args.add(getClassPath());
+ args.addAll(getSourceFiles(mSourceDir));
+
+ Process process = new ProcessBuilder(args).start();
+ Scanner scanner = null;
+ try {
+ scanner = new Scanner(process.getInputStream());
+ while (scanner.hasNextLine()) {
+ System.out.println(scanner.nextLine());
+ }
+ } finally {
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+
+ return process.waitFor();
+ }
+
+ private String getSourcePath(File sourceDir) {
+ List<String> sourcePath = new ArrayList<String>();
+ sourcePath.add("./frameworks/base/core/java");
+ sourcePath.add("./frameworks/base/test-runner/src");
+ sourcePath.add("./libcore/junit/src/main/java");
+ sourcePath.add("./development/tools/hosttestlib/src");
+ sourcePath.add("./libcore/dalvik/src/main/java");
+ sourcePath.add("./cts/tests/src");
+ sourcePath.add(sourceDir.toString());
+ return join(sourcePath, ":");
+ }
+
+ private String getClassPath() {
+ List<String> classPath = new ArrayList<String>();
+ classPath.add("./prebuilt/common/tradefed/tradefed-prebuilt.jar");
+ return join(classPath, ":");
+ }
+
+ private List<String> getSourceFiles(File sourceDir) {
+ List<String> sourceFiles = new ArrayList<String>();
+
+ File[] files = sourceDir.listFiles(new FileFilter() {
+ @Override
+ public boolean accept(File pathname) {
+ return pathname.isDirectory() || pathname.toString().endsWith(".java");
+ }
+ });
+
+ for (File file : files) {
+ if (file.isDirectory()) {
+ sourceFiles.addAll(getSourceFiles(file));
+ } else {
+ sourceFiles.add(file.toString());
+ }
+ }
+
+ return sourceFiles;
+ }
+
+ private String join(List<String> options, String delimiter) {
+ StringBuilder builder = new StringBuilder();
+ int numOptions = options.size();
+ for (int i = 0; i < numOptions; i++) {
+ builder.append(options.get(i));
+ if (i + 1 < numOptions) {
+ builder.append(delimiter);
+ }
+ }
+ return builder.toString();
+ }
+}
diff --git a/tools/cts-native-scanner/Android.mk b/tools/cts-native-scanner/Android.mk
new file mode 100644
index 0000000..f8b1629
--- /dev/null
+++ b/tools/cts-native-scanner/Android.mk
@@ -0,0 +1,43 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# We use copy-file-to-new-target so that the installed
+# script file's timestamp is at least as new as the
+# .jar file it wraps.
+
+# the hat script
+# ============================================================
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE := cts-native-scanner
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/$(LOCAL_MODULE) | $(ACP)
+ @echo "Copy: $(PRIVATE_MODULE) ($@)"
+ $(copy-file-to-new-target)
+ $(hide) chmod 755 $@
+
+# the other stuff
+# ============================================================
+subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
+ src \
+ ))
+
+include $(subdirs)
diff --git a/tools/cts-native-scanner/etc/cts-native-scanner b/tools/cts-native-scanner/etc/cts-native-scanner
new file mode 100644
index 0000000..bf6138f
--- /dev/null
+++ b/tools/cts-native-scanner/etc/cts-native-scanner
@@ -0,0 +1,46 @@
+#!/bin/bash
+#
+# Copyright (C) 2011, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+ newProg=`/bin/ls -ld "${prog}"`
+ newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+ if expr "x${newProg}" : 'x/' >/dev/null; then
+ prog="${newProg}"
+ else
+ progdir=`dirname "${prog}"`
+ prog="${progdir}/${newProg}"
+ fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+libdir=`dirname $progdir`/framework
+
+javaOpts=""
+while expr "x$1" : 'x-J' >/dev/null; do
+ opt=`expr "$1" : '-J\(.*\)'`
+ javaOpts="${javaOpts} -${opt}"
+ shift
+done
+
+exec java $javaOpts -jar $libdir/cts-native-scanner.jar "$@"
diff --git a/tools/cts-native-scanner/src/Android.mk b/tools/cts-native-scanner/src/Android.mk
new file mode 100644
index 0000000..9c97b1d
--- /dev/null
+++ b/tools/cts-native-scanner/src/Android.mk
@@ -0,0 +1,28 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+
+# cts-native-scanner java library
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_JAR_MANIFEST := MANIFEST.mf
+
+LOCAL_MODULE := cts-native-scanner
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-native-scanner/src/MANIFEST.mf b/tools/cts-native-scanner/src/MANIFEST.mf
new file mode 100644
index 0000000..85eb991
--- /dev/null
+++ b/tools/cts-native-scanner/src/MANIFEST.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.android.cts.nativescanner.CtsNativeScanner
diff --git a/tools/cts-native-scanner/src/com/android/cts/nativescanner/CtsNativeScanner.java b/tools/cts-native-scanner/src/com/android/cts/nativescanner/CtsNativeScanner.java
new file mode 100644
index 0000000..a7599b0
--- /dev/null
+++ b/tools/cts-native-scanner/src/com/android/cts/nativescanner/CtsNativeScanner.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.nativescanner;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Class that searches a source directory for native gTests and outputs a
+ * list of test classes and methods.
+ */
+public class CtsNativeScanner {
+
+ private static void usage(String[] args) {
+ System.err.println("Arguments: " + Arrays.asList(args));
+ System.err.println("Usage: cts-native-scanner -s SOURCE_DIR -t TEST_SUITE");
+ System.exit(1);
+ }
+
+ public static void main(String[] args) throws Exception {
+ File sourceDir = null;
+ String testSuite = null;
+
+ for (int i = 0; i < args.length; i++) {
+ if ("-s".equals(args[i])) {
+ sourceDir = new File(getArg(args, ++i, "Missing value for source directory"));
+ } else if ("-t".equals(args[i])) {
+ testSuite = getArg(args, ++i, "Missing value for test suite");
+ } else {
+ System.err.println("Unsupported flag: " + args[i]);
+ usage(args);
+ }
+ }
+
+ if (sourceDir == null) {
+ System.out.println("Source directory is required");
+ usage(args);
+ }
+
+ if (testSuite == null) {
+ System.out.println("Test suite is required");
+ usage(args);
+ }
+
+ TestScanner scanner = new TestScanner(sourceDir, testSuite);
+ List<String> testNames = scanner.getTestNames();
+ for (String name : testNames) {
+ System.out.println(name);
+ }
+ }
+
+ private static String getArg(String[] args, int index, String message) {
+ if (index < args.length) {
+ return args[index];
+ } else {
+ System.err.println(message);
+ usage(args);
+ return null;
+ }
+ }
+}
diff --git a/tools/cts-native-scanner/src/com/android/cts/nativescanner/TestScanner.java b/tools/cts-native-scanner/src/com/android/cts/nativescanner/TestScanner.java
new file mode 100644
index 0000000..9411566
--- /dev/null
+++ b/tools/cts-native-scanner/src/com/android/cts/nativescanner/TestScanner.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.nativescanner;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Scanner of C++ gTest source files.
+ *
+ * It looks for test declarations and outputs a file following this format:
+ *
+ * class:TestClass1
+ * method:testMethod1
+ * method:testMethod2
+ * class:TestClass2
+ * method:testMethod1
+ *
+ */
+class TestScanner {
+
+ /** Directory to recursively scan for gTest test declarations. */
+ private final File mSourceDir;
+
+ private final String mTestSuite;
+
+ TestScanner(File sourceDir, String testSuite) {
+ mSourceDir = sourceDir;
+ mTestSuite = testSuite;
+ }
+
+ public List<String> getTestNames() throws IOException {
+ List<String> testNames = new ArrayList<String>();
+ scanDir(mSourceDir, testNames);
+ return testNames;
+ }
+
+ private void scanDir(File dir, List<String> testNames) throws FileNotFoundException {
+ // Find both C++ files to find tests and directories to look for more tests!
+ File[] files = dir.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String filename) {
+ return filename.endsWith(".cpp") || filename.endsWith(".cc")
+ || new File(dir, filename).isDirectory();
+ }
+ });
+
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (file.isDirectory()) {
+ scanDir(file, testNames);
+ } else {
+ scanFile(file, testNames);
+ }
+ }
+ }
+ // We want to find lines like class SLObjectCreationTest : public ::testing::Test { ...
+ // and extract the "SLObjectCreationTest" as group #1
+ private static final Pattern CLASS_REGEX =
+ Pattern.compile("\\s*class\\s+(\\w+).*");
+
+ // We want to find lines like TEST_F(SLObjectCreationTest, testAudioPlayerFromFdCreation) { ...
+ // and extract the "testAudioPlayerFromFdCreation" as group #1
+ private static final Pattern METHOD_REGEX =
+ Pattern.compile("\\s*TEST_F\\(\\w+,\\s*(\\w+)\\).*");
+
+ private void scanFile(File file, List<String> testNames) throws FileNotFoundException {
+ Scanner scanner = null;
+ try {
+ scanner = new Scanner(file);
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ Matcher matcher = CLASS_REGEX.matcher(line);
+ if (matcher.matches()) {
+ testNames.add("suite:" + mTestSuite);
+ testNames.add("case:" + matcher.group(1));
+ continue;
+ }
+
+ matcher = METHOD_REGEX.matcher(line);
+ if (matcher.matches()) {
+ testNames.add("test:" + matcher.group(1));
+ continue;
+ }
+ }
+ } finally {
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+ }
+}
diff --git a/tools/cts-native-xml-generator/Android.mk b/tools/cts-native-xml-generator/Android.mk
deleted file mode 100644
index c02d745..0000000
--- a/tools/cts-native-xml-generator/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-# We use copy-file-to-new-target so that the installed
-# script file's timestamp is at least as new as the
-# .jar file it wraps.
-
-# the hat script
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := cts-native-xml-generator
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/$(LOCAL_MODULE) | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-new-target)
- $(hide) chmod 755 $@
-
-# the other stuff
-# ============================================================
-subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
- src \
- ))
-
-include $(subdirs)
diff --git a/tools/cts-native-xml-generator/etc/cts-native-xml-generator b/tools/cts-native-xml-generator/etc/cts-native-xml-generator
deleted file mode 100644
index cae5f4a..0000000
--- a/tools/cts-native-xml-generator/etc/cts-native-xml-generator
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set up prog to be the path of this script, including following symlinks,
-# and set up progdir to be the fully-qualified pathname of its directory.
-prog="$0"
-while [ -h "${prog}" ]; do
- newProg=`/bin/ls -ld "${prog}"`
- newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
- if expr "x${newProg}" : 'x/' >/dev/null; then
- prog="${newProg}"
- else
- progdir=`dirname "${prog}"`
- prog="${progdir}/${newProg}"
- fi
-done
-oldwd=`pwd`
-progdir=`dirname "${prog}"`
-cd "${progdir}"
-progdir=`pwd`
-prog="${progdir}"/`basename "${prog}"`
-cd "${oldwd}"
-
-libdir=`dirname $progdir`/framework
-
-javaOpts=""
-while expr "x$1" : 'x-J' >/dev/null; do
- opt=`expr "$1" : '-J\(.*\)'`
- javaOpts="${javaOpts} -${opt}"
- shift
-done
-
-exec java $javaOpts -jar $libdir/cts-native-xml-generator.jar "$@"
diff --git a/tools/cts-native-xml-generator/src/Android.mk b/tools/cts-native-xml-generator/src/Android.mk
deleted file mode 100644
index ed93457..0000000
--- a/tools/cts-native-xml-generator/src/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-
-# cts-native-xml-generator java library
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_RESOURCE_DIRS :=
-LOCAL_JAR_MANIFEST := MANIFEST.mf
-
-LOCAL_MODULE := cts-native-xml-generator
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-native-xml-generator/src/MANIFEST.mf b/tools/cts-native-xml-generator/src/MANIFEST.mf
deleted file mode 100644
index b8bde72..0000000
--- a/tools/cts-native-xml-generator/src/MANIFEST.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.android.cts.nativexml.CtsNativeXmlGenerator
diff --git a/tools/cts-native-xml-generator/src/com/android/cts/nativexml/CtsNativeXmlGenerator.java b/tools/cts-native-xml-generator/src/com/android/cts/nativexml/CtsNativeXmlGenerator.java
deleted file mode 100644
index 1a436dd..0000000
--- a/tools/cts-native-xml-generator/src/com/android/cts/nativexml/CtsNativeXmlGenerator.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.cts.nativexml;
-
-import java.io.File;
-import java.util.Arrays;
-
-/**
- * Class that searches a source directory for native gTests and outputs a
- * test package xml.
- */
-public class CtsNativeXmlGenerator {
-
- private static void usage(String[] args) {
- System.err.println("Arguments: " + Arrays.asList(args));
- System.err.println("Usage: cts-native-xml-generator -p PACKAGE_NAME -n EXECUTABLE_NAME "
- + "-s SOURCE_DIR [-o OUTPUT_FILE]");
- System.exit(1);
- }
-
- public static void main(String[] args) throws Exception {
- String appPackageName = null;
- String name = null;
- File sourceDir = null;
- String outputPath = null;
-
- for (int i = 0; i < args.length; i++) {
- if ("-p".equals(args[i])) {
- if (i + 1 < args.length) {
- appPackageName = args[++i];
- } else {
- System.err.println("Missing value for test package");
- usage(args);
- }
- } else if ("-n".equals(args[i])) {
- if (i + 1 < args.length) {
- name = args[++i];
- } else {
- System.err.println("Missing value for executable name");
- usage(args);
- }
- } else if ("-o".equals(args[i])) {
- if (i + 1 < args.length) {
- outputPath = args[++i];
- } else {
- System.err.println("Missing value for output file");
- usage(args);
- }
- } else if ("-s".equals(args[i])) {
- if (i + 1 < args.length) {
- sourceDir = new File(args[++i]);
- } else {
- System.err.println("Missing value for source directory");
- usage(args);
- }
- } else {
- System.err.println("Unsupported flag: " + args[i]);
- usage(args);
- }
- }
-
- if (appPackageName == null) {
- System.out.println("Package name is required");
- usage(args);
- } else if (name == null) {
- System.out.println("Executable name is required");
- usage(args);
- } else if (sourceDir == null) {
- System.out.println("Source directory is required");
- usage(args);
- }
-
- Generator generator = new Generator(appPackageName, name, sourceDir, outputPath);
- generator.writePackageXml();
- }
-}
diff --git a/tools/cts-native-xml-generator/src/com/android/cts/nativexml/Generator.java b/tools/cts-native-xml-generator/src/com/android/cts/nativexml/Generator.java
deleted file mode 100644
index 7c074b8..0000000
--- a/tools/cts-native-xml-generator/src/com/android/cts/nativexml/Generator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.cts.nativexml;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Scanner;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Generator of TestPackage XML files for native gTests.
- *
- * It scours all the C++ source files in a given source directory looking
- * for test declarations and outputs a XML test listing.
- */
-class Generator {
-
- /** Test package name like "android.nativemedia" to group the tests. */
- private final String mAppPackageName;
-
- /** Name of the native executable. */
- private final String mName;
-
- /** Directory to recursively scan for gTest test declarations. */
- private final File mSourceDir;
-
- /** Path to output file or null to just dump to standard out. */
- private final String mOutputPath;
-
- Generator(String appPackageName, String name, File sourceDir, String outputPath) {
- mAppPackageName = appPackageName;
- mName = name;
- mSourceDir = sourceDir;
- mOutputPath = outputPath;
- }
-
- public void writePackageXml() throws IOException {
- OutputStream output = System.out;
- if (mOutputPath != null) {
- File outputFile = new File(mOutputPath);
- File outputDir = outputFile.getParentFile();
- if (!outputDir.exists()) {
- outputDir.mkdirs();
- if (!outputDir.exists()) {
- System.err.println("Couldn't make output directory: " + outputDir);
- System.exit(1);
- }
- }
- output = new FileOutputStream(outputFile);
- }
-
- PrintWriter writer = null;
- try {
- writer = new PrintWriter(output);
- writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- writeTestPackage(writer);
- } finally {
- if (writer != null) {
- writer.close();
- }
- }
- }
-
- private void writeTestPackage(PrintWriter writer) throws FileNotFoundException {
- writer.append("<TestPackage appPackageName=\"")
- .append(mAppPackageName)
- .append("\" name=\"")
- .append(mName)
- .println("\" testType=\"native\" version=\"1.0\">");
- writeTestSuite(writer);
- writer.println("</TestPackage>");
- }
-
- private void writeTestSuite(PrintWriter writer) throws FileNotFoundException {
- /*
- * Given "android.foo.bar.baz"...
- *
- * <TestSuite name="android">
- * <TestSuite name="foo">
- * <TestSuite name="bar">
- * <TestSuite name="baz">
- */
- Scanner scanner = null;
- try {
- scanner = new Scanner(mAppPackageName);
- scanner.useDelimiter("\\.");
-
- int numLevels = 0;
- for (; scanner.hasNext(); numLevels++) {
- String packagePart = scanner.next();
- writer.append("<TestSuite name=\"").append(packagePart).println("\">");
- }
-
- writeTestCases(writer, mSourceDir);
-
- for (; numLevels > 0; numLevels--) {
- writer.println("</TestSuite>");
- }
- } finally {
- if (scanner != null) {
- scanner.close();
- }
- }
- }
-
- private void writeTestCases(PrintWriter writer, File dir) throws FileNotFoundException {
- // Find both C++ files to find tests and directories to look for more tests!
- File[] files = dir.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String filename) {
- return filename.endsWith(".cpp") || new File(dir, filename).isDirectory();
- }
- });
-
- for (int i = 0; i < files.length; i++) {
- File file = files[i];
- if (file.isDirectory()) {
- writeTestCases(writer, file);
- } else {
- // Take the test name from the name of the file. It's probably
- // more accurate to take the name from inside the file...
- String fileName = file.getName();
- int extension = fileName.lastIndexOf('.');
- if (extension != -1) {
- fileName = fileName.substring(0, extension);
- }
-
- writer.append("<TestCase name=\"").append(fileName).println("\">");
- writeTests(writer, file);
- writer.println("</TestCase>");
- }
- }
- }
-
- // We want to find lines like TEST_F(SLObjectCreationTest, testAudioPlayerFromFdCreation) { ...
- // and extract the "testAudioPlayerFromFdCreation" as group #1
- private static final Pattern TEST_REGEX = Pattern.compile("\\s*TEST_F\\(\\w+,\\s*(\\w+)\\).*");
-
- private void writeTests(PrintWriter writer, File file) throws FileNotFoundException {
- Scanner scanner = null;
- try {
- scanner = new Scanner(file);
- while (scanner.hasNextLine()) {
- String line = scanner.nextLine();
- Matcher matcher = TEST_REGEX.matcher(line);
- if (matcher.matches()) {
- String name = matcher.group(1);
- writer.append("<Test name=\"").append(name).println("\" />");
- }
- }
- } finally {
- if (scanner != null) {
- scanner.close();
- }
- }
- }
-}
diff --git a/tools/cts-xml-generator/Android.mk b/tools/cts-xml-generator/Android.mk
new file mode 100644
index 0000000..5842dd8
--- /dev/null
+++ b/tools/cts-xml-generator/Android.mk
@@ -0,0 +1,43 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# We use copy-file-to-new-target so that the installed
+# script file's timestamp is at least as new as the
+# .jar file it wraps.
+
+# the hat script
+# ============================================================
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE := cts-xml-generator
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/$(LOCAL_MODULE) | $(ACP)
+ @echo "Copy: $(PRIVATE_MODULE) ($@)"
+ $(copy-file-to-new-target)
+ $(hide) chmod 755 $@
+
+# the other stuff
+# ============================================================
+subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
+ src \
+ ))
+
+include $(subdirs)
diff --git a/tools/cts-xml-generator/etc/cts-xml-generator b/tools/cts-xml-generator/etc/cts-xml-generator
new file mode 100644
index 0000000..5f05af6
--- /dev/null
+++ b/tools/cts-xml-generator/etc/cts-xml-generator
@@ -0,0 +1,46 @@
+#!/bin/bash
+#
+# Copyright (C) 2011, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+ newProg=`/bin/ls -ld "${prog}"`
+ newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+ if expr "x${newProg}" : 'x/' >/dev/null; then
+ prog="${newProg}"
+ else
+ progdir=`dirname "${prog}"`
+ prog="${progdir}/${newProg}"
+ fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+libdir=`dirname $progdir`/framework
+
+javaOpts=""
+while expr "x$1" : 'x-J' >/dev/null; do
+ opt=`expr "$1" : '-J\(.*\)'`
+ javaOpts="${javaOpts} -${opt}"
+ shift
+done
+
+exec java $javaOpts -jar $libdir/cts-xml-generator.jar "$@"
diff --git a/tools/cts-xml-generator/src/Android.mk b/tools/cts-xml-generator/src/Android.mk
new file mode 100644
index 0000000..62f8692
--- /dev/null
+++ b/tools/cts-xml-generator/src/Android.mk
@@ -0,0 +1,30 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+
+# cts-xml-generator java library
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_JAR_MANIFEST := MANIFEST.mf
+
+LOCAL_MODULE := cts-xml-generator
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_JAVA_LIBRARIES := vogarexpectlib
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-xml-generator/src/MANIFEST.mf b/tools/cts-xml-generator/src/MANIFEST.mf
new file mode 100644
index 0000000..ce4178e
--- /dev/null
+++ b/tools/cts-xml-generator/src/MANIFEST.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.android.cts.xmlgenerator.CtsXmlGenerator
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java
new file mode 100644
index 0000000..ce4fdd7
--- /dev/null
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/CtsXmlGenerator.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.xmlgenerator;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import vogar.ExpectationStore;
+import vogar.ModeId;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+/** Class that outputs a test package xml. */
+public class CtsXmlGenerator {
+
+ private static void usage(String[] args) {
+ System.err.println("Arguments: " + Arrays.asList(args));
+ System.err.println("Usage: cts-xml-generator -p PACKAGE_NAME -n NAME [-t TEST_TYPE]"
+ + " [-j JAR_PATH] [-i INSTRUMENTATION] [-m MANIFEST_FILE] [-e EXPECTATION_FILE]"
+ + " [-o OUTPUT_FILE]");
+ System.exit(1);
+ }
+
+ public static void main(String[] args) throws Exception {
+ String appPackageName = null;
+ String name = null;
+ String outputPath = null;
+ Set<File> expectationFiles = new HashSet<File>();
+ File manifestFile = null;
+ String instrumentation = null;
+ String testType = null;
+ String jarPath = null;
+
+ for (int i = 0; i < args.length; i++) {
+ if ("-p".equals(args[i])) {
+ appPackageName = getArg(args, ++i, "Missing value for test package");
+ } else if ("-n".equals(args[i])) {
+ name = getArg(args, ++i, "Missing value for executable name");
+ } else if ("-t".equals(args[i])) {
+ testType = getArg(args, ++i, "Missing value for test type");
+ } else if ("-j".equals(args[i])) {
+ jarPath = getArg(args, ++i, "Missing value for jar path");
+ } else if ("-m".equals(args[i])) {
+ manifestFile = new File(getArg(args, ++i, "Missing value for manifest"));
+ } else if ("-i".equals(args[i])) {
+ instrumentation = getArg(args, ++i, "Missing value for instrumentation");
+ } else if ("-e".equals(args[i])) {
+ expectationFiles.add(new File(getArg(args, ++i,
+ "Missing value for expectation store")));
+ } else if ("-o".equals(args[i])) {
+ outputPath = getArg(args, ++i, "Missing value for output file");
+ } else {
+ System.err.println("Unsupported flag: " + args[i]);
+ usage(args);
+ }
+ }
+
+ String appNameSpace = null;
+ String runner = null;
+ String targetNameSpace = null;
+
+ if (manifestFile != null) {
+ Document manifest = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+ .parse(manifestFile);
+ Element documentElement = manifest.getDocumentElement();
+ appNameSpace = documentElement.getAttribute("package");
+ runner = getElementAttribute(documentElement, "instrumentation",
+ "android:name");
+ targetNameSpace = getElementAttribute(documentElement, "instrumentation",
+ "android:targetPackage");
+ }
+
+ if (appPackageName == null) {
+ System.out.println("Package name is required");
+ usage(args);
+ } else if (name == null) {
+ System.out.println("Executable name is required");
+ usage(args);
+ }
+
+ ExpectationStore store = ExpectationStore.parse(expectationFiles, ModeId.DEVICE);
+ XmlGenerator generator = new XmlGenerator(store, appNameSpace, appPackageName,
+ name, runner, instrumentation, targetNameSpace, jarPath, testType, outputPath);
+ generator.writePackageXml();
+ }
+
+ private static String getArg(String[] args, int index, String message) {
+ if (index < args.length) {
+ return args[index];
+ } else {
+ System.err.println(message);
+ usage(args);
+ return null;
+ }
+ }
+
+ private static String getElementAttribute(Element parentElement, String elementName,
+ String attributeName) {
+ NodeList nodeList = parentElement.getElementsByTagName(elementName);
+ if (nodeList.getLength() > 0) {
+ Element element = (Element) nodeList.item(0);
+ return element.getAttribute(attributeName);
+ }
+ return null;
+ }
+}
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestCase.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestCase.java
new file mode 100644
index 0000000..bab3476
--- /dev/null
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestCase.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.xmlgenerator;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+class TestCase {
+
+ private final String mName;
+
+ private final List<String> mTests = new ArrayList<String>();
+
+ public TestCase(String name) {
+ mName = name;
+ }
+
+ public String getName() {
+ return mName;
+ }
+
+ public void addTest(String test) {
+ mTests.add(test);
+ }
+
+ public Collection<String> getTests() {
+ return Collections.unmodifiableCollection(mTests);
+ }
+}
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestListParser.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestListParser.java
new file mode 100644
index 0000000..76e1437
--- /dev/null
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestListParser.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.xmlgenerator;
+
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+
+/**
+ * Parser of test lists that are in the format of:
+ *
+ * suite:android.holo.cts
+ * case:HoloTest
+ * test:testHolo
+ * test:testHoloDialog
+ */
+class TestListParser {
+
+ public Collection<TestSuite> parse(InputStream input) {
+ Map<String, TestSuite> suiteMap = new HashMap<String, TestSuite>();
+ TestSuite currentSuite = null;
+ TestCase currentCase = null;
+ Scanner scanner = null;
+ try {
+ scanner = new Scanner(input);
+ while(scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ String[] tokens = line.split(":");
+ if (tokens.length != 2) {
+ continue;
+ }
+
+ String key = tokens[0];
+ String value = tokens[1];
+ if ("suite".equals(key)) {
+ currentSuite = handleSuite(suiteMap, value);
+ } else if ("case".equals(key)) {
+ currentCase = handleCase(currentSuite, value);
+ } else if ("test".equals(key)) {
+ handleTest(currentCase, value);
+ }
+ }
+ } finally {
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+ return suiteMap.values();
+ }
+
+ private TestSuite handleSuite(Map<String, TestSuite> suiteMap, String fullSuite) {
+ String[] suites = fullSuite.split("\\.");
+ int numSuites = suites.length;
+ TestSuite lastSuite = null;
+
+ for (int i = 0; i < numSuites; i++) {
+ String name = suites[i];
+ if (lastSuite != null) {
+ if (lastSuite.hasSuite(name)) {
+ lastSuite = lastSuite.getSuite(name);
+ } else {
+ TestSuite newSuite = new TestSuite(name);
+ lastSuite.addSuite(newSuite);
+ lastSuite = newSuite;
+ }
+ } else if (suiteMap.containsKey(name)) {
+ lastSuite = suiteMap.get(name);
+ } else {
+ lastSuite = new TestSuite(name);
+ suiteMap.put(name, lastSuite);
+ }
+ }
+
+ return lastSuite;
+ }
+
+ private TestCase handleCase(TestSuite suite, String caseName) {
+ TestCase testCase = new TestCase(caseName);
+ suite.addCase(testCase);
+ return testCase;
+ }
+
+ private void handleTest(TestCase testCase, String test) {
+ testCase.addTest(test);
+ }
+}
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestSuite.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestSuite.java
new file mode 100644
index 0000000..3c29603
--- /dev/null
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/TestSuite.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.xmlgenerator;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class TestSuite {
+
+ private final String mName;
+
+ private final Map<String, TestSuite> mSuites = new HashMap<String, TestSuite>();
+
+ private final List<TestCase> mCases = new ArrayList<TestCase>();
+
+ public TestSuite(String name) {
+ mName = name;
+ }
+
+ public String getName() {
+ return mName;
+ }
+
+ public boolean hasSuite(String name) {
+ return mSuites.containsKey(name);
+ }
+
+ public TestSuite getSuite(String name) {
+ return mSuites.get(name);
+ }
+
+ public void addSuite(TestSuite suite) {
+ mSuites.put(suite.mName, suite);
+ }
+
+ public Collection<TestSuite> getSuites() {
+ return Collections.unmodifiableCollection(mSuites.values());
+ }
+
+ public void addCase(TestCase testCase) {
+ mCases.add(testCase);
+ }
+
+ public Collection<TestCase> getCases() {
+ return Collections.unmodifiableCollection(mCases);
+ }
+}
diff --git a/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java
new file mode 100644
index 0000000..cd2275d
--- /dev/null
+++ b/tools/cts-xml-generator/src/com/android/cts/xmlgenerator/XmlGenerator.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.xmlgenerator;
+
+import vogar.Expectation;
+import vogar.ExpectationStore;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Collection;
+
+/**
+ * Generator of TestPackage XML files for native tests.
+ *
+ * It takes in an input of the following form:
+ *
+ * suite: x.y.z
+ * case:TestClass1
+ * test:testMethod1
+ * test:testMethod2
+ * case:TestClass2
+ * test:testMethod1
+ * suite: x.y
+ * case:TestClass3
+ * test:testMethod2
+ */
+class XmlGenerator {
+
+ /** Example: com.android.cts.holo */
+ private final String mAppNamespace;
+
+ /** Test package name like "android.nativemedia" to group the tests. */
+ private final String mAppPackageName;
+
+ /** Name of the native executable. */
+ private final String mName;
+
+ /** Test runner */
+ private final String mRunner;
+
+ private final String mTargetBinaryName;
+
+ private final String mTargetNameSpace;
+
+ private final String mJarPath;
+
+ private final String mTestType;
+
+ /** Path to output file or null to just dump to standard out. */
+ private final String mOutputPath;
+
+ /** ExpectationStore to filter out known failures. */
+ private final ExpectationStore mExpectations;
+
+ XmlGenerator(ExpectationStore expectations, String appNameSpace, String appPackageName,
+ String name, String runner, String targetBinaryName, String targetNameSpace,
+ String jarPath, String testType, String outputPath) {
+ mAppNamespace = appNameSpace;
+ mAppPackageName = appPackageName;
+ mName = name;
+ mRunner = runner;
+ mTargetBinaryName = targetBinaryName;
+ mTargetNameSpace = targetNameSpace;
+ mJarPath = jarPath;
+ mTestType = testType;
+ mOutputPath = outputPath;
+ mExpectations = expectations;
+ }
+
+ public void writePackageXml() throws IOException {
+ OutputStream output = System.out;
+ if (mOutputPath != null) {
+ File outputFile = new File(mOutputPath);
+ output = new FileOutputStream(outputFile);
+ }
+
+ PrintWriter writer = null;
+ try {
+ writer = new PrintWriter(output);
+ writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ writeTestPackage(writer);
+ } finally {
+ if (writer != null) {
+ writer.close();
+ }
+ }
+ }
+
+ private void writeTestPackage(PrintWriter writer) {
+ writer.append("<TestPackage");
+ if (mAppNamespace != null) {
+ writer.append(" appNameSpace=\"").append(mAppNamespace).append("\"");
+ }
+
+ writer.append(" appPackageName=\"").append(mAppPackageName).append("\"");
+ writer.append(" name=\"").append(mName).append("\"");
+
+ if (mRunner != null) {
+ writer.append(" runner=\"").append(mRunner).append("\"");
+ }
+
+ if (mAppNamespace != null && mTargetNameSpace != null
+ && !mAppNamespace.equals(mTargetNameSpace)) {
+ writer.append(" targetBinaryName=\"").append(mTargetBinaryName).append("\"");
+ writer.append(" targetNameSpace=\"").append(mTargetNameSpace).append("\"");
+ }
+
+ if (mTestType != null) {
+ writer.append(" testType=\"").append(mTestType).append("\"");
+ }
+
+ if (mJarPath != null) {
+ writer.append(" jarPath=\"").append(mJarPath).append("\"");
+ }
+
+ writer.println(" version=\"1.0\">");
+
+ TestListParser parser = new TestListParser();
+ Collection<TestSuite> suites = parser.parse(System.in);
+ StringBuilder nameCollector = new StringBuilder();
+ writeTestSuites(writer, suites, nameCollector);
+ writer.println("</TestPackage>");
+ }
+
+ private void writeTestSuites(PrintWriter writer, Collection<TestSuite> suites,
+ StringBuilder nameCollector) {
+ for (TestSuite suite : suites) {
+ writer.append("<TestSuite name=\"").append(suite.getName()).println("\">");
+
+ String namePart = suite.getName();
+ if (nameCollector.length() > 0) {
+ namePart = "." + namePart;
+ }
+ nameCollector.append(namePart);
+
+ writeTestSuites(writer, suite.getSuites(), nameCollector);
+ writeTestCases(writer, suite.getCases(), nameCollector);
+
+ nameCollector.delete(nameCollector.length() - namePart.length(),
+ nameCollector.length());
+ writer.println("</TestSuite>");
+ }
+ }
+
+ private void writeTestCases(PrintWriter writer, Collection<TestCase> cases,
+ StringBuilder nameCollector) {
+ for (TestCase testCase : cases) {
+ String name = testCase.getName();
+ writer.append("<TestCase name=\"").append(name).println("\">");
+ nameCollector.append('.').append(name);
+
+ writeTests(writer, testCase.getTests(), nameCollector);
+
+ nameCollector.delete(nameCollector.length() - name.length() - 1,
+ nameCollector.length());
+ writer.println("</TestCase>");
+ }
+ }
+
+ private void writeTests(PrintWriter writer, Collection<String> tests,
+ StringBuilder nameCollector) {
+ for (String test : tests) {
+ nameCollector.append('#').append(test);
+ writer.append("<Test name=\"").append(test).append("\"");
+ if (isKnownFailure(mExpectations, nameCollector.toString())) {
+ writer.append(" expectation=\"failure\"");
+ }
+ writer.println(" />");
+
+ nameCollector.delete(nameCollector.length() - test.length() - 1,
+ nameCollector.length());
+ }
+ }
+
+ public static boolean isKnownFailure(ExpectationStore expectationStore, String testName) {
+ return expectationStore != null && expectationStore.get(testName) != Expectation.SUCCESS;
+ }
+}
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
index ca0c803..565ac7f 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -185,6 +185,10 @@
screenSize = "large";
break;
+ case Configuration.SCREENLAYOUT_SIZE_XLARGE:
+ screenSize = "xlarge";
+ break;
+
case Configuration.SCREENLAYOUT_SIZE_UNDEFINED:
screenSize = "undefined";
break;
@@ -200,10 +204,13 @@
case DisplayMetrics.DENSITY_MEDIUM:
return "mdpi";
+ case DisplayMetrics.DENSITY_TV:
+ return "tvdpi";
+
case DisplayMetrics.DENSITY_HIGH:
return "hdpi";
- case 320:
+ case DisplayMetrics.DENSITY_XHIGH:
return "xdpi";
default:
@@ -281,7 +288,7 @@
try {
String[] rootProcesses = RootProcessScanner.getRootProcesses();
for (String rootProcess : rootProcesses) {
- builder.append(rootProcess).append(';');
+ builder.append(rootProcess).append(':').append(0).append(';');
}
} catch (Exception exception) {
Log.e(TAG, "Error getting processes: " + exception.getMessage(), exception);
@@ -336,5 +343,4 @@
return builder.toString();
}
-
}
diff --git a/tools/tradefed-host/.classpath b/tools/tradefed-host/.classpath
index 197543c..275ecf9 100644
--- a/tools/tradefed-host/.classpath
+++ b/tools/tradefed-host/.classpath
@@ -6,7 +6,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
<classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
- <classpathentry combineaccessrules="false" kind="src" path="/hosttestlib"/>
- <classpathentry combineaccessrules="false" exported="true" kind="src" path="/ctsdeviceinfolib"/>
+ <classpathentry exported="true" kind="var" path="CTS_SRC_ROOT/out/host/common/obj/JAVA_LIBRARIES/ctsdeviceinfolib_intermediates/javalib.jar"/>
+ <classpathentry exported="true" kind="var" path="CTS_SRC_ROOT/out/host/common/obj/JAVA_LIBRARIES/hosttestlib_intermediates/javalib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tools/tradefed-host/res/report/cts_result.css b/tools/tradefed-host/res/report/cts_result.css
index d7ce510..f825d7a 100644
--- a/tools/tradefed-host/res/report/cts_result.css
+++ b/tools/tradefed-host/res/report/cts_result.css
@@ -22,18 +22,8 @@
margin:10;
}
-table {
- font-size:1em;
- margin:0 0 1em;
- padding:0;
- border-collapse:collapse;
- border-width:0;
- empty-cells:show;
- width: 95%;
-}
-
/* Report logo and device name */
-#title table {
+table.title {
padding:5px;
border-width: 0px;
margin-left:auto;
@@ -41,120 +31,82 @@
vertical-align:middle;
}
-/* Device and test plan summary below the title */
-#summary table {
+table.summary {
background-color: rgb(212, 233, 169);
- -moz-border-radius:5px;
- border-radius:5px;
- padding:5px;
- border-color: #A5C639 #A5C639 #A5C639 #A5C639;
- border-width: 0px 0px 0px 0px;
+ border-collapse:collapse;
+ border: 0px solid #A5C639;
margin-left:auto;
margin-right:auto;
- width:80%;
}
-#summary th {
+table.summary th {
background-color: #A5C639;
- font-size:1.2em;
- height: 2em;
- width: 50%;
+ font-size: 1.2em;
+ padding: 0.5em;
}
-#summary td {
+table.summary td {
border-width: 0px 0px 0px 0px;
border-color: gray;
border-style: inset;
- font-size:1em;
+ font-size: 1em;
+ padding: 0.5em;
vertical-align: top;
}
-#summaryinfo table {
+table.testsummary {
background-color: rgb(212, 233, 169);
- padding:5px;
- border-width:0;
+ border-collapse:collapse;
margin-left:auto;
margin-right:auto;
}
-#summaryinfo td {
- padding:1px;
- border-width: 0px 0px 0px 0px;
- vertical-align: top;
-}
-
-/* The test summary */
-#testsummary table {
- background-color: rgb(212, 233, 169);
- padding:5px;
- border-width:1;
- border-color: #A5C639;
- margin-left:auto;
- margin-right:auto;
- width: 40%;
-}
-
-#testsummary th {
+table.testsummary th {
background-color: #A5C639;
- border-width: 1px;
- border-color: gray;
- border-style: outset;
- height: 2em;
+ border: 1px outset gray;
+ padding: 0.5em;
}
-#testsummary td {
- border-width: 1px;
- border-color: #A5C639;
- border-style: outset;
+table.testsummary td {
+ border: 1px outset #A5C639;
+ padding: 0.5em;
text-align: center;
}
-/* The test details */
-#testdetail table {
+table.testdetails {
background-color: rgb(212, 233, 169);
- padding:5px;
+ border-collapse:collapse;
border-width:1;
border-color: #A5C639;
margin-left:auto;
margin-right:auto;
- width: 95%;
- table-layout:fixed;
+ margin-bottom: 2em;
vertical-align: top;
+ width: 95%;
}
-#testdetail th {
+table.testdetails th {
background-color: #A5C639;
border-width: 1px;
border-color: gray;
border-style: outset;
height: 2em;
+ padding: 0.2em;
}
-#testdetail td {
+table.testdetails td {
border-width: 1px;
border-color: #A5C639;
border-style: outset;
text-align: left;
vertical-align: top;
- padding:1;
+ padding: 0.2em;
}
-/* The test package name */
-#none table {
- border-width:0;
- border-color: white;
+table.testdetails td.package {
background-color: white;
- text-align:left;
- border-collapse:collapse;
-}
-
-#none td {
- border-width:0;
- border-color: white;
- background-color: white;
- text-align:left;
- border-collapse:collapse;
- font-weight:bold;
+ border: 0px;
+ font-weight: bold;
}
/* Test cell details */
@@ -224,7 +176,7 @@
font-weight:bold;
}
-#details {
+div.details {
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */
diff --git a/tools/tradefed-host/res/report/cts_result.xsl b/tools/tradefed-host/res/report/cts_result.xsl
index 6fe7cec..fd2b732 100644
--- a/tools/tradefed-host/res/report/cts_result.xsl
+++ b/tools/tradefed-host/res/report/cts_result.xsl
@@ -21,14 +21,21 @@
<xsl:template match="/">
<html>
- <STYLE type="text/css">
- @import "cts_result.css";
- </STYLE>
-
+ <head>
+ <title>Test Report for <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model" /> - <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/></title>
+ <script>
+ function toggle(id) {
+ e = document.getElementById(id)
+ e.style.display = e.style.display == "none" ? "block" : "none"
+ }
+ </script>
+ <STYLE type="text/css">
+ @import "cts_result.css";
+ </STYLE>
+ </head>
<body>
- <!-- Title of the Report -->
- <DIV id="title">
- <TABLE>
+ <DIV>
+ <TABLE class="title">
<TR>
<TD width="40%" align="left"><img src="logo.gif"></img></TD>
<TD width="60%" align="left">
@@ -42,325 +49,328 @@
<img src="newrule-green.png" align="left"></img>
<br></br>
+
+ <center>
+ <a href="#" onclick="toggle('summary');">Show Device Information</a>
+ </center>
+
<br></br>
- <!-- Header with phone and plan information -->
- <DIV id="summary">
- <TABLE width="90%" frame="none">
+ <DIV id="summary" style="display: none">
+ <TABLE class="summary">
<TR>
- <TH>Device Information</TH>
- <TH>Test Summary</TH>
+ <TH colspan="2">Device Information</TH>
</TR>
-
<TR>
- <TD>
+ <TD width="50%">
<!-- Device information -->
- <div id="summaryinfo">
- <TABLE width="75%">
- <TR>
- <TD class="rowtitle">Build Model</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Build Name</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildName"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Build Brand</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_brand"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Build Manufacturer</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_manufacturer"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Device ID</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Firmware Version</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildVersion"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Firmware Build Number</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildID"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Build Fingerprint</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_fingerprint"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Build ABI</TD>
- <TD>
- <xsl:value-of
- select="TestResult/DeviceInfo/BuildInfo/@build_abi"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Build ABI2</TD>
- <TD>
- <xsl:value-of
- select="TestResult/DeviceInfo/BuildInfo/@build_abi2"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Android Platform Version</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@androidPlatformVersion"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Supported Locales</TD>
- <TD>
- <xsl:call-template name="formatDelimitedString">
- <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@locales"/>
- </xsl:call-template>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Screen Size</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_size"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Resolution</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/Screen/@resolution"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Density</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density"/>
- (<xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density_bucket"/>)
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Phone number</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/PhoneSubInfo/@subscriberId"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">X dpi</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Xdpi"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Y dpi</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Ydpi"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Touch</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@touch"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Navigation</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@navigation"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Keypad</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@keypad"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Network</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@network"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">IMEI</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imei"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">IMSI</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imsi"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Open GL ES Version</TD>
- <TD>
- <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@openGlEsVersion"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Open GL Compressed Texture Formats</TD>
- <TD>
- <UL>
- <xsl:for-each select="TestResult/DeviceInfo/OpenGLCompressedTextureFormatsInfo/TextureFormat">
- <LI><xsl:value-of select="@name" /></LI>
- </xsl:for-each>
- </UL>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Features</TD>
- <TD>
- <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='sdk']">
- <xsl:text>[</xsl:text>
- <xsl:choose>
- <xsl:when test="@available = 'true'">
- <xsl:text>X</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>_</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>] </xsl:text>
-
- <xsl:value-of select="@name" />
- <br />
+ <TABLE>
+ <TR>
+ <TD class="rowtitle">Build Model</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build Name</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildName"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build Brand</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_brand"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build Manufacturer</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_manufacturer"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Device ID</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Firmware Version</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildVersion"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Firmware Build Number</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildID"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build Fingerprint</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_fingerprint"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build ABI</TD>
+ <TD>
+ <xsl:value-of
+ select="TestResult/DeviceInfo/BuildInfo/@build_abi"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build ABI2</TD>
+ <TD>
+ <xsl:value-of
+ select="TestResult/DeviceInfo/BuildInfo/@build_abi2"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Android Platform Version</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@androidPlatformVersion"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Supported Locales</TD>
+ <TD>
+ <xsl:call-template name="formatDelimitedString">
+ <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@locales"/>
+ </xsl:call-template>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Screen Size</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_size"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Resolution</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/Screen/@resolution"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Density</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density"/>
+ (<xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density_bucket"/>)
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Phone number</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/PhoneSubInfo/@subscriberId"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">X dpi</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Xdpi"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Y dpi</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Ydpi"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Touch</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@touch"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Navigation</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@navigation"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Keypad</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@keypad"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Network</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@network"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">IMEI</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imei"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">IMSI</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imsi"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Open GL ES Version</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@openGlEsVersion"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Open GL Compressed Texture Formats</TD>
+ <TD>
+ <UL>
+ <xsl:for-each select="TestResult/DeviceInfo/OpenGLCompressedTextureFormatsInfo/TextureFormat">
+ <LI><xsl:value-of select="@name" /></LI>
</xsl:for-each>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Other Features</TD>
- <TD>
- <UL>
- <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='other']">
- <LI><xsl:value-of select="@name" /></LI>
- </xsl:for-each>
- </UL>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Root Processes</TD>
- <TD>
- <UL>
- <xsl:for-each select="TestResult/DeviceInfo/ProcessInfo/Process[@uid='0']">
- <LI><xsl:value-of select="@name" /></LI>
- </xsl:for-each>
- </UL>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Partitions</TD>
- <TD>
- <UL>
- <pre>
- <xsl:call-template name="formatDelimitedString">
- <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@partitions" />
- <xsl:with-param name="numTokensPerRow" select="1" />
- </xsl:call-template>
- </pre>
- </UL>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">System Libraries</TD>
- <TD>
- <UL>
- <xsl:for-each select="TestResult/DeviceInfo/SystemLibrariesInfo/Library">
- <LI><xsl:value-of select="@name" /></LI>
- </xsl:for-each>
- </UL>
- </TD>
- </TR>
- </TABLE>
- </div>
+ </UL>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Root Processes</TD>
+ <TD>
+ <UL>
+ <xsl:for-each select="TestResult/DeviceInfo/ProcessInfo/Process[@uid='0']">
+ <LI><xsl:value-of select="@name" /></LI>
+ </xsl:for-each>
+ </UL>
+ </TD>
+ </TR>
+
+ </TABLE>
</TD>
- <!-- plan information -->
- <TD>
- <div id="summaryinfo">
- <TABLE width="75%">
- <TR>
- <TD class="rowtitle">CTS version</TD>
- <TD>
- <xsl:value-of select="TestResult/HostInfo/Cts/@version"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Test timeout</TD>
- <TD>
- <xsl:value-of select="TestResult/HostInfo/Cts/IntValue[@name='testStatusTimeoutMs']/@value" /> ms
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Host Info</TD>
- <TD>
- <xsl:value-of select="TestResult/HostInfo/@name"/>
- (<xsl:value-of select="TestResult/HostInfo/Os/@name"/> -
- <xsl:value-of select="TestResult/HostInfo/Os/@version"/>)
- </TD>
- </TR>
- <TR><TD><BR></BR></TD><TD></TD></TR>
- <TR>
- <TD class="rowtitle">Plan name</TD>
- <TD>
- <xsl:value-of select="TestResult/@testPlan"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Start time</TD>
- <TD>
- <xsl:value-of select="TestResult/@starttime"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">End time</TD>
- <TD>
- <xsl:value-of select="TestResult/@endtime"/>
- </TD>
- </TR>
+ <TD width="50%">
+ <TABLE>
- <!-- Test Summary -->
- <TR><TD><BR></BR></TD><TD></TD></TR>
- <TR>
- <TD class="rowtitle">Tests Passed</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@pass"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Tests Failed</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@failed"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Tests Timed out</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@timeout"/>
- </TD>
- </TR>
- <TR>
- <TD class="rowtitle">Tests Not Executed</TD>
- <TD>
- <xsl:value-of select="TestResult/Summary/@notExecuted"/>
- </TD>
- </TR>
- </TABLE>
- </div>
+ <TR>
+ <TD class="rowtitle">Features</TD>
+ <TD>
+ <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='sdk']">
+ <xsl:text>[</xsl:text>
+ <xsl:choose>
+ <xsl:when test="@available = 'true'">
+ <xsl:text>X</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>_</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>] </xsl:text>
+
+ <xsl:value-of select="@name" />
+ <br />
+ </xsl:for-each>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Other Features</TD>
+ <TD>
+ <UL>
+ <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='other']">
+ <LI><xsl:value-of select="@name" /></LI>
+ </xsl:for-each>
+ </UL>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">System Libraries</TD>
+ <TD>
+ <UL>
+ <xsl:for-each select="TestResult/DeviceInfo/SystemLibrariesInfo/Library">
+ <LI><xsl:value-of select="@name" /></LI>
+ </xsl:for-each>
+ </UL>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Partitions</TD>
+ <TD>
+ <pre>
+ <xsl:call-template name="formatDelimitedString">
+ <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@partitions" />
+ <xsl:with-param name="numTokensPerRow" select="1" />
+ </xsl:call-template>
+ </pre>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ </TABLE>
+ <br />
+ <br />
+ </DIV>
+
+ <DIV>
+ <TABLE class="summary">
+ <TR>
+ <TH colspan="2">Test Summary</TH>
+ </TR>
+ <TR>
+ <TD class="rowtitle">CTS version</TD>
+ <TD>
+ <xsl:value-of select="TestResult/HostInfo/Cts/@version"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Test timeout</TD>
+ <TD>
+ <xsl:value-of select="TestResult/HostInfo/Cts/IntValue[@name='testStatusTimeoutMs']/@value" /> ms
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Host Info</TD>
+ <TD>
+ <xsl:value-of select="TestResult/HostInfo/@name"/>
+ (<xsl:value-of select="TestResult/HostInfo/Os/@name"/> -
+ <xsl:value-of select="TestResult/HostInfo/Os/@version"/>)
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Plan name</TD>
+ <TD>
+ <xsl:value-of select="TestResult/@testPlan"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Start time</TD>
+ <TD>
+ <xsl:value-of select="TestResult/@starttime"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">End time</TD>
+ <TD>
+ <xsl:value-of select="TestResult/@endtime"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Tests Passed</TD>
+ <TD>
+ <xsl:value-of select="TestResult/Summary/@pass"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Tests Failed</TD>
+ <TD>
+ <xsl:value-of select="TestResult/Summary/@failed"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Tests Timed out</TD>
+ <TD>
+ <xsl:value-of select="TestResult/Summary/@timeout"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Tests Not Executed</TD>
+ <TD>
+ <xsl:value-of select="TestResult/Summary/@notExecuted"/>
</TD>
</TR>
</TABLE>
@@ -368,8 +378,8 @@
<!-- High level summary of test execution -->
<h2 align="center">Test Summary by Package</h2>
- <DIV id="testsummary">
- <TABLE>
+ <DIV>
+ <TABLE class="testsummary">
<TR>
<TH>Test Package</TH>
<TH>Passed</TH>
@@ -435,26 +445,23 @@
<xsl:template name="detailedTestReport">
<xsl:param name="resultFilter" />
- <DIV id="testdetail">
+ <DIV>
<xsl:for-each select="TestResult/TestPackage">
<xsl:if test="$resultFilter=''
or count(TestSuite//TestCase/Test[@result=$resultFilter]) > 0">
- <DIV id="none">
- <TABLE>
- <TR>
- <TD class="none" align="left">
- <xsl:variable name="href"><xsl:value-of select="@appPackageName"/></xsl:variable>
- <a name="{$href}">Compatibility Test Package: <xsl:value-of select="@appPackageName"/></a>
- </TD>
- </TR>
- </TABLE>
- </DIV>
- <TABLE>
+ <TABLE class="testdetails">
<TR>
- <TH width="25%">Test</TH>
- <TH width="7%">Result</TH>
- <TH width="68%">Failure Details</TH>
+ <TD class="package" colspan="3">
+ <xsl:variable name="href"><xsl:value-of select="@appPackageName"/></xsl:variable>
+ <a name="{$href}">Compatibility Test Package: <xsl:value-of select="@appPackageName"/></a>
+ </TD>
+ </TR>
+
+ <TR>
+ <TH width="30%">Test</TH>
+ <TH width="5%">Result</TH>
+ <TH>Failure Details</TH>
</TR>
<!-- test case -->
@@ -505,7 +512,7 @@
</div>
</TD>
<TD class="failuredetails">
- <div id="details">
+ <div class="details">
A test that was a known failure actually passed. Please check.
</div>
</TD>
@@ -529,7 +536,7 @@
</div>
</TD>
<TD class="failuredetails">
- <div id="details">
+ <div class="details">
<xsl:value-of select="FailedScene/@message"/>
</div>
</TD>
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildHelper.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildHelper.java
index 5945cd8..8029b75 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildHelper.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildHelper.java
@@ -135,7 +135,7 @@
/**
* @return a {@link File} representing the test plan directory
*/
- public File getTestPlansDir() throws FileNotFoundException {
+ public File getTestPlansDir() {
return new File(getRepositoryDir(), "plans");
}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
index c28631b..f53507d 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@
@Option(name="cts-install-path", description="the path to the cts installation to use")
private String mCtsRootDirPath = System.getProperty("CTS_ROOT");
- public static final String CTS_BUILD_VERSION = "4.0.3_r1";
+ public static final String CTS_BUILD_VERSION = "4.0_r1";
/**
* {@inheritDoc}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java b/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
index 82fa0d7..b688bfe 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
@@ -183,18 +183,13 @@
return name.endsWith(".xml");
}
};
- try {
- for (File planFile : ctsBuild.getTestPlansDir().listFiles(xmlFilter)) {
- printLine(FileUtil.getBaseName(planFile.getName()));
- }
- }
- catch (FileNotFoundException e) {
- printLine("Could not find CTS plan folder");
+ for (File planFile : ctsBuild.getTestPlansDir().listFiles(xmlFilter)) {
+ printLine(FileUtil.getBaseName(planFile.getName()));
}
}
private void listPackages(CtsBuildHelper ctsBuild) {
- ITestPackageRepo testCaseRepo = new TestPackageRepo(ctsBuild.getTestCasesDir());
+ ITestPackageRepo testCaseRepo = new TestPackageRepo(ctsBuild.getTestCasesDir(), false);
for (String packageUri : testCaseRepo.getPackageNames()) {
printLine(packageUri);
}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java
index d5f4530..0b08871 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java
@@ -15,14 +15,14 @@
*/
package com.android.cts.tradefed.result;
-import android.tests.getinfo.DeviceInfoConstants;
-
import com.android.tradefed.log.LogUtil.CLog;
import org.kxml2.io.KXmlSerializer;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
+import android.tests.getinfo.DeviceInfoConstants;
+
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
@@ -42,20 +42,25 @@
private static final String BUILD_TAG = "BuildInfo";
private static final String PHONE_TAG = "PhoneSubInfo";
private static final String SCREEN_TAG = "Screen";
+
private static final String FEATURE_INFO_TAG = "FeatureInfo";
private static final String FEATURE_TAG = "Feature";
private static final String FEATURE_ATTR_DELIM = ":";
private static final String FEATURE_DELIM = ";";
+
private static final String OPENGL_TEXTURE_FORMATS_INFO_TAG =
"OpenGLCompressedTextureFormatsInfo";
private static final String OPENGL_TEXTURE_FORMAT_TAG = "TextureFormat";
private static final String OPENGL_TEXTURE_FORMAT_DELIM = ";";
+
private static final String SYSLIB_INFO_TAG = "SystemLibrariesInfo";
private static final String SYSLIB_TAG = "Library";
private static final String SYSLIB_DELIM = ";";
+
private static final String PROCESS_INFO_TAG = "ProcessInfo";
private static final String PROCESS_TAG = "Process";
private static final String PROCESS_DELIM = ";";
+ private static final String PROCESS_ATTR_DELIM = ":";
private Map<String, String> mMetrics = new HashMap<String, String>();
@@ -125,141 +130,74 @@
return value;
}
- /**
- * Prints XML indicating what features are supported by the device. It parses a string from the
- * featureData argument that is in the form of "feature1:true;feature2:false;featuer3;true;"
- * with a trailing semi-colon.
- *
- * <pre>
- * <FeatureInfo>
- * <Feature name="android.name.of.feature" available="true" />
- * ...
- * </FeatureInfo>
- * </pre>
- *
- * @param serializer used to create XML
- * @param featureData raw unparsed feature data
- */
private void serializeFeatureInfo(KXmlSerializer serializer, String featureData)
throws IOException {
- serializer.startTag(ns, FEATURE_INFO_TAG);
-
- if (featureData == null) {
- featureData = "";
- }
-
- String[] featurePairs = featureData.split(FEATURE_DELIM);
- for (String featurePair : featurePairs) {
- String[] nameTypeAvailability = featurePair.split(FEATURE_ATTR_DELIM);
- if (nameTypeAvailability.length >= 3) {
- serializer.startTag(ns, FEATURE_TAG);
- serializer.attribute(ns, "name", nameTypeAvailability[0]);
- serializer.attribute(ns, "type", nameTypeAvailability[1]);
- serializer.attribute(ns, "available", nameTypeAvailability[2]);
- serializer.endTag(ns, FEATURE_TAG);
- }
- }
- serializer.endTag(ns, FEATURE_INFO_TAG);
+ serialize(serializer, FEATURE_INFO_TAG, FEATURE_TAG, FEATURE_DELIM, FEATURE_ATTR_DELIM,
+ featureData, "name", "type", "available");
}
- /**
- * Prints XML data indicating what particular processes of interest were running on the device.
- * It parses a string from the rootProcesses argument that is in the form of
- * "processName1;processName2;..." with a trailing semi-colon.
- *
- * <pre>
- * <ProcessInfo>
- * <Process name="long_cat_viewer" uid="0" />
- * ...
- * </ProcessInfo>
- * </pre>
- */
private void serializeProcessInfo(KXmlSerializer serializer, String rootProcesses)
throws IOException {
- serializer.startTag(ns, PROCESS_INFO_TAG);
-
- if (rootProcesses == null) {
- rootProcesses = "";
- }
-
- String[] processNames = rootProcesses.split(PROCESS_DELIM);
- for (String processName : processNames) {
- processName = processName.trim();
- if (processName.length() > 0) {
- serializer.startTag(ns, PROCESS_TAG);
- serializer.attribute(ns, "name", processName);
- serializer.attribute(ns, "uid", "0");
- serializer.endTag(ns, PROCESS_TAG);
- }
- }
- serializer.endTag(ns, PROCESS_INFO_TAG);
+ serialize(serializer, PROCESS_INFO_TAG, PROCESS_TAG, PROCESS_DELIM, PROCESS_ATTR_DELIM,
+ rootProcesses, "name", "uid");
}
- /**
- * Prints XML data in two level hierarchy.
- * It parses a string from the root argument that is in the form of
- * "element1-delimiter-element2-delimiter..." with a trailing delimiter
- *
- * <pre>
- * <infoTag>
- * <elementTag name="element1" />
- * ...
- * </infoTag>
- * </pre>
- */
- private void serializeSimpleInfo(KXmlSerializer serializer, String root,
- String infoTag, String elementTag, String delimiter)
- throws IOException {
- serializer.startTag(ns, infoTag);
-
- if (root == null) {
- root = "";
- }
-
- String[] elemNames = root.split(delimiter);
- for (String elemName : elemNames) {
- elemName = elemName.trim();
- if (elemName.length() > 0) {
- serializer.startTag(ns, elementTag);
- serializer.attribute(ns, "name", elemName);
- serializer.endTag(ns, elementTag);
- }
- }
- serializer.endTag(ns, infoTag);
- }
-
- /**
- * Prints XML data listing available OpenGL Compressed Texture Formats.
- *
- * <pre>
- * <OpenGLCompressedTextureFormatsInfo>
- * <TextureFormat name="abc" />
- * ...
- * </OpenGLCompressedTextureFormatsInfo>
- * </pre>
- */
private void serializeOpenGLCompressedTextureFormatsInfo(KXmlSerializer serializer,
- String root) throws IOException {
- serializeSimpleInfo(serializer, root, OPENGL_TEXTURE_FORMATS_INFO_TAG,
- OPENGL_TEXTURE_FORMAT_TAG,
- OPENGL_TEXTURE_FORMAT_DELIM);
+ String formats) throws IOException {
+ serialize(serializer, OPENGL_TEXTURE_FORMATS_INFO_TAG, OPENGL_TEXTURE_FORMAT_TAG,
+ OPENGL_TEXTURE_FORMAT_DELIM, null, formats, "name");
+ }
+
+ private void serializeSystemLibrariesInfo(KXmlSerializer serializer, String libs)
+ throws IOException {
+ serialize(serializer, SYSLIB_INFO_TAG, SYSLIB_TAG, SYSLIB_DELIM, null, libs, "name");
}
/**
- * Prints XML data listing available system libraries.
- * It parses a string from the rootLibraries argument that is in the form of
- * "libName1;libName2;..." with a trailing semi-colon.
+ * Serializes a XML structure where there is an outer tag with tags inside it.
*
* <pre>
- * <SystemLibrariesInfo>
- * <Library name="a.b.c" />
- * ...
- * </SystemLibrariesInfo>
+ * Input: value1:value2;value3:value4
+ *
+ * Output:
+ * <OuterTag>
+ * <SubTag attr1="value1" attr2="value2" />
+ * <SubTag attr1="value3" attr2="value4" />
+ * </OuterTag>
* </pre>
+ *
+ * @param serializer to do it
+ * @param tag would be "OuterTag"
+ * @param subTag would be "SubTag"
+ * @param delim would be ";"
+ * @param attrDelim would be ":" in the example but can be null if only one attrName given
+ * @param data would be "value1:value2;value3:value4"
+ * @param attrNames would be an array with "attr1", "attr2"
+ * @throws IOException if there is a problem
*/
- private void serializeSystemLibrariesInfo(KXmlSerializer serializer, String rootLibraries)
- throws IOException {
- serializeSimpleInfo(serializer, rootLibraries, SYSLIB_INFO_TAG, SYSLIB_TAG, SYSLIB_DELIM);
+ private void serialize(KXmlSerializer serializer, String tag, String subTag,
+ String delim, String attrDelim, String data, String... attrNames) throws IOException {
+ serializer.startTag(ns, tag);
+
+ if (data == null) {
+ data = "";
+ }
+
+ String[] values = data.split(delim);
+ for (String value : values) {
+ if (!value.isEmpty()) {
+ String[] attrValues = attrDelim != null ? value.split(attrDelim) : new String[] {value};
+ if (attrValues.length == attrNames.length) {
+ serializer.startTag(ns, subTag);
+ for (int i = 0; i < attrNames.length; i++) {
+ serializer.attribute(ns, attrNames[i], attrValues[i]);
+ }
+ serializer.endTag(ns, subTag);
+ }
+ }
+ }
+
+ serializer.endTag(ns, tag);
}
/**
@@ -282,20 +220,12 @@
parser.getName().equals(BUILD_TAG)) {
addMetricsFromAttributes(parser);
} else if (parser.getName().equals(FEATURE_INFO_TAG)) {
- // store features into metrics map, in the same format as when collected from
- // device
mMetrics.put(DeviceInfoConstants.FEATURES, parseFeatures(parser));
} else if (parser.getName().equals(PROCESS_INFO_TAG)) {
- // store processes into metrics map, in the same format as when collected from
- // device
mMetrics.put(DeviceInfoConstants.PROCESSES, parseProcess(parser));
} else if (parser.getName().equals(SYSLIB_INFO_TAG)) {
- // store system libs into metrics map, in the same format as when collected from
- // device
mMetrics.put(DeviceInfoConstants.SYS_LIBRARIES, parseSystemLibraries(parser));
} else if (parser.getName().equals(OPENGL_TEXTURE_FORMATS_INFO_TAG)) {
- // store OpenGL texture formats into metrics map, in the same format as when
- // collected from device
mMetrics.put(DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS,
parseOpenGLCompressedTextureFormats(parser));
}
@@ -306,99 +236,77 @@
}
}
- /**
- * Parse process XML, and return its contents as a delimited String
- */
- private String parseProcess(XmlPullParser parser) throws XmlPullParserException, IOException {
- if (!parser.getName().equals(PROCESS_INFO_TAG)) {
- throw new XmlPullParserException(String.format(
- "invalid XML: Expected %s tag but received %s", PROCESS_INFO_TAG,
- parser.getName()));
- }
- StringBuilder processString = new StringBuilder();
- int eventType = parser.getEventType();
- while (eventType != XmlPullParser.END_DOCUMENT) {
- if (eventType == XmlPullParser.START_TAG && parser.getName().equals(PROCESS_TAG)) {
- processString.append(getAttribute(parser, "name"));
- processString.append(PROCESS_DELIM);
- } else if (eventType == XmlPullParser.END_TAG && parser.getName().equals(
- PROCESS_INFO_TAG)) {
- return processString.toString();
- }
- eventType = parser.next();
- }
- return processString.toString();
- }
-
- /**
- * Parse feature XML, and return its contents as a delimited String
- */
private String parseFeatures(XmlPullParser parser) throws XmlPullParserException, IOException {
- if (!parser.getName().equals(FEATURE_INFO_TAG)) {
- throw new XmlPullParserException(String.format(
- "invalid XML: Expected %s tag but received %s", FEATURE_INFO_TAG,
- parser.getName()));
- }
- StringBuilder featureString = new StringBuilder();
- int eventType = parser.getEventType();
- while (eventType != XmlPullParser.END_DOCUMENT) {
- if (eventType == XmlPullParser.START_TAG && parser.getName().equals(FEATURE_TAG)) {
- featureString.append(getAttribute(parser, "name"));
- featureString.append(FEATURE_ATTR_DELIM);
- featureString.append(getAttribute(parser, "type"));
- featureString.append(FEATURE_ATTR_DELIM);
- featureString.append(getAttribute(parser, "available"));
- featureString.append(FEATURE_DELIM);
- } else if (eventType == XmlPullParser.END_TAG
- && parser.getName().equals(FEATURE_INFO_TAG)) {
- return featureString.toString();
- }
- eventType = parser.next();
- }
- return featureString.toString();
-
+ return parseTag(parser, FEATURE_INFO_TAG, FEATURE_TAG, FEATURE_DELIM, FEATURE_ATTR_DELIM,
+ "name", "type", "available");
}
- /**
- * Parse two-level hierarchy XML, and return its contents as a delimited String
- */
- private String parseSimpleInfo(XmlPullParser parser, String infoTag, String elementTag,
- String delimiter) throws XmlPullParserException, IOException {
- if (!parser.getName().equals(infoTag)) {
- throw new XmlPullParserException(String.format(
- "invalid XML: Expected %s tag but received %s", infoTag,
- parser.getName()));
- }
- StringBuilder result = new StringBuilder();
- int eventType = parser.getEventType();
- while (eventType != XmlPullParser.END_DOCUMENT) {
- if (eventType == XmlPullParser.START_TAG && parser.getName().equals(elementTag)) {
- result.append(getAttribute(parser, "name"));
- result.append(delimiter);
- } else if (eventType == XmlPullParser.END_TAG && parser.getName().equals(
- infoTag)) {
- return result.toString();
- }
- eventType = parser.next();
- }
- return result.toString();
+ private String parseProcess(XmlPullParser parser) throws XmlPullParserException, IOException {
+ return parseTag(parser, PROCESS_INFO_TAG, PROCESS_TAG, PROCESS_DELIM,
+ PROCESS_ATTR_DELIM, "name", "uid");
}
- /**
- * Parse JavaLibrariesInfo XML, and return its contents as a delimited String
- */
private String parseOpenGLCompressedTextureFormats(XmlPullParser parser)
throws XmlPullParserException, IOException {
- return parseSimpleInfo(parser, OPENGL_TEXTURE_FORMATS_INFO_TAG, OPENGL_TEXTURE_FORMAT_TAG,
- OPENGL_TEXTURE_FORMAT_DELIM);
+ return parseTag(parser, OPENGL_TEXTURE_FORMATS_INFO_TAG, OPENGL_TEXTURE_FORMAT_TAG,
+ OPENGL_TEXTURE_FORMAT_DELIM, null, "name");
+ }
+
+ private String parseSystemLibraries(XmlPullParser parser)
+ throws XmlPullParserException, IOException {
+ return parseTag(parser, SYSLIB_INFO_TAG, SYSLIB_TAG, SYSLIB_DELIM, null, "name");
}
/**
- * Parse JavaLibrariesInfo XML, and return its contents as a delimited String
+ * Converts XML into a flattened string.
+ *
+ * <pre>
+ * Input:
+ * <OuterTag>
+ * <SubTag attr1="value1" attr2="value2" />
+ * <SubTag attr1="value3" attr2="value4" />
+ * </OuterTag>
+ *
+ * Output: value1:value2;value3:value4
+ * </pre>
+ *
+ * @param parser that parses the xml
+ * @param tag like "OuterTag"
+ * @param subTag like "SubTag"
+ * @param delim like ";"
+ * @param attrDelim like ":" or null if tehre is only one attribute
+ * @param attrNames like "attr1", "attr2"
+ * @return flattened string like "value1:value2;value3:value4"
+ * @throws XmlPullParserException
+ * @throws IOException
*/
- private String parseSystemLibraries(XmlPullParser parser)
- throws XmlPullParserException, IOException {
- return parseSimpleInfo(parser, SYSLIB_INFO_TAG, SYSLIB_TAG, SYSLIB_DELIM);
+ private String parseTag(XmlPullParser parser, String tag, String subTag, String delim,
+ String attrDelim, String... attrNames) throws XmlPullParserException, IOException {
+ if (!parser.getName().equals(tag)) {
+ throw new XmlPullParserException(String.format(
+ "invalid XML: Expected %s tag but received %s", tag,
+ parser.getName()));
+ }
+ StringBuilder flattened = new StringBuilder();
+
+ for (int eventType = parser.getEventType();
+ eventType != XmlPullParser.END_DOCUMENT;
+ eventType = parser.next()) {
+
+ if (eventType == XmlPullParser.START_TAG && parser.getName().equals(subTag)) {
+ for (int i = 0; i < attrNames.length; i++) {
+ flattened.append(getAttribute(parser, attrNames[i]));
+ if (i + 1 < attrNames.length) {
+ flattened.append(attrDelim);
+ }
+ }
+ flattened.append(delim);
+ } else if (eventType == XmlPullParser.END_TAG && parser.getName().equals(tag)) {
+ break;
+ }
+ }
+
+ return flattened.toString();
}
/**
@@ -416,8 +324,6 @@
* <p/>
* Check that the provided device info metrics are consistent with the currently stored metrics.
* If any inconsistencies occur, logs errors and stores error messages in the metrics map
- *
- * @param runResult
*/
public void populateMetrics(Map<String, String> metrics) {
if (mMetrics.isEmpty()) {
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/PlanCreator.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/PlanCreator.java
index 5e0dcb8..d263bc8 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/PlanCreator.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/PlanCreator.java
@@ -16,6 +16,7 @@
package com.android.cts.tradefed.result;
import com.android.cts.tradefed.build.CtsBuildHelper;
+import com.android.cts.tradefed.testtype.CtsTest;
import com.android.cts.tradefed.testtype.ITestPackageDef;
import com.android.cts.tradefed.testtype.ITestPackageRepo;
import com.android.cts.tradefed.testtype.ITestPlan;
@@ -55,6 +56,9 @@
importance=Importance.IF_UNSET)
private String mResultFilterString = null;
+ @Option(name = CtsTest.RUN_KNOWN_FAILURES_OPTION)
+ private boolean mIncludeKnownFailures = false;
+
private CtsTestStatus mResultFilter = null;
private TestResults mResult = null;
@@ -63,7 +67,8 @@
/**
* Create an empty {@link PlanCreator}.
* <p/>
- * All {@link Option} fields must be populated via {@link ArgsOptionParser}
+ * All {@link Option} fields must be populated via
+ * {@link com.android.tradefed.config.ArgsOptionParser}
*/
public PlanCreator() {
}
@@ -102,12 +107,13 @@
* {@link Option} values must all be set before this is called.
*
* @param build
- * @return
+ * @return test plan
* @throws ConfigurationException
*/
public ITestPlan createDerivedPlan(CtsBuildHelper build) throws ConfigurationException {
checkFields(build);
- ITestPackageRepo pkgDefRepo = new TestPackageRepo(build.getTestCasesDir());
+ ITestPackageRepo pkgDefRepo = new TestPackageRepo(build.getTestCasesDir(),
+ mIncludeKnownFailures);
ITestPlan derivedPlan = new TestPlan(mPlanName);
for (TestPackageResult pkg : mResult.getPackages()) {
Collection<TestIdentifier> filteredTests = pkg.getTestsWithStatus(mResultFilter);
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
index c78b71b..8142036 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -41,8 +41,6 @@
import com.android.tradefed.testtype.IShardableTest;
import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
-import junit.framework.Test;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -59,6 +57,8 @@
import java.util.Queue;
import java.util.Set;
+import junit.framework.Test;
+
/**
* A {@link Test} for running CTS tests.
* <p/>
@@ -72,6 +72,7 @@
private static final String CLASS_OPTION = "class";
private static final String METHOD_OPTION = "method";
public static final String CONTINUE_OPTION = "continue-session";
+ public static final String RUN_KNOWN_FAILURES_OPTION = "run-known-failures";
public static final String PACKAGE_NAME_METRIC = "packageName";
public static final String PACKAGE_DIGEST_METRIC = "packageDigest";
@@ -127,6 +128,10 @@
"Warning: can potentially use a lot of disk space.")
private boolean mBugreport = false;
+ @Option(name = RUN_KNOWN_FAILURES_OPTION, shortName = 'k', description =
+ "run tests including known failures")
+ private boolean mIncludeKnownFailures;
+
/** data structure for a {@link IRemoteTest} and its known tests */
class TestPackage {
private final IRemoteTest mTestForPackage;
@@ -584,7 +589,7 @@
* Exposed for unit testing
*/
ITestPackageRepo createTestCaseRepo() {
- return new TestPackageRepo(mCtsBuild.getTestCasesDir());
+ return new TestPackageRepo(mCtsBuild.getTestCasesDir(), mIncludeKnownFailures);
}
/**
@@ -634,10 +639,6 @@
if (mCtsBuild == null) {
throw new IllegalArgumentException("missing CTS build");
}
- if ("CTS".equals(mPlanName)) {
- CLog.i("Switching to CTS-TF plan instead of CTS plan for faster execution of vm-tests");
- mPlanName = "CTS-TF";
- }
}
/**
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
index 8cccab0..d6e9ec6 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
@@ -41,6 +41,10 @@
*/
class TestPackageDef implements ITestPackageDef {
+ public static final String HOST_SIDE_ONLY_TEST = "hostSideOnly";
+ public static final String NATIVE_TEST = "native";
+ public static final String VM_HOST_TEST = "vmHostTest";
+
private static final String SIGNATURE_TEST_METHOD = "testSignature";
private static final String SIGNATURE_TEST_CLASS = "android.tests.sigtest.SimpleSignatureTest";
@@ -48,14 +52,10 @@
private String mAppNameSpace = null;
private String mName = null;
private String mRunner = null;
- private boolean mIsHostSideTest = false;
private boolean mIsVMHostTest = false;
private String mTestType = null;
private String mJarPath = null;
private boolean mIsSignatureTest = false;
- private boolean mIsReferenceAppTest = false;
- private String mPackageToTest = null;
- private String mApkToTestName = null;
private String mTestPackageName = null;
private String mDigest = null;
@@ -112,28 +112,14 @@
return mRunner;
}
- void setIsHostSideTest(boolean hostSideTest) {
- mIsHostSideTest = hostSideTest;
-
- }
-
- boolean isHostSideTest() {
- return mIsHostSideTest;
- }
-
- void setIsVMHostTest(boolean vmHostTest) {
- mIsVMHostTest = vmHostTest;
-
- }
-
- boolean isVMHostTest() {
- return mIsVMHostTest;
- }
-
void setTestType(String testType) {
mTestType = testType;
}
+ String getTestType() {
+ return mTestType;
+ }
+
void setJarPath(String jarPath) {
mJarPath = jarPath;
}
@@ -150,26 +136,10 @@
return mIsSignatureTest;
}
- void setIsReferenceApp(boolean isReferenceApp) {
- mIsReferenceAppTest = isReferenceApp;
- }
-
- boolean isReferenceApp() {
- return mIsReferenceAppTest;
- }
-
- void setPackageToTest(String packageName) {
- mPackageToTest = packageName;
- }
-
void setTestPackageName(String testPackageName) {
mTestPackageName = testPackageName;
}
- void setApkToTest(String apkName) {
- mApkToTestName = apkName;
- }
-
void setTargetBinaryName(String targetBinaryName) {
mTargetBinaryName = targetBinaryName;
}
@@ -219,7 +189,7 @@
mExcludedTestFilter.setTestInclusion(mClassName, mMethodName);
mTests = filterTests();
- if (mIsHostSideTest) {
+ if (HOST_SIDE_ONLY_TEST.equals(mTestType)) {
CLog.d("Creating host test for %s", mName);
JarHostTest hostTest = new JarHostTest();
hostTest.setRunName(getUri());
@@ -227,7 +197,7 @@
hostTest.setTests(mTests);
mDigest = generateDigest(testCaseDir, mJarPath);
return hostTest;
- } else if (mIsVMHostTest) {
+ } else if (VM_HOST_TEST.equals(mTestType)) {
CLog.d("Creating vm host test for %s", mName);
VMHostTest vmHostTest = new VMHostTest();
vmHostTest.setRunName(getUri());
@@ -235,7 +205,7 @@
vmHostTest.setTests(mTests);
mDigest = generateDigest(testCaseDir, mJarPath);
return vmHostTest;
- } else if ("native".equals(mTestType)) {
+ } else if (NATIVE_TEST.equals(mTestType)) {
return new GeeTest(mUri, mName);
} else if (mIsSignatureTest) {
// TODO: hardcode the runner/class/method for now, since current package xml points to
@@ -255,11 +225,6 @@
instrTest.addInstallApk(String.format("%s.apk", mName), mAppNameSpace);
mDigest = generateDigest(testCaseDir, String.format("%s.apk", mName));
return instrTest;
- } else if (mIsReferenceAppTest) {
- // a reference app test is just a InstrumentationTest with one extra apk to install
- InstrumentationApkTest instrTest = new InstrumentationApkTest();
- instrTest.addInstallApk(String.format("%s.apk", mApkToTestName), mPackageToTest);
- return setInstrumentationTest(instrTest, testCaseDir);
} else {
CLog.d("Creating instrumentation test for %s", mName);
InstrumentationApkTest instrTest = new InstrumentationApkTest();
@@ -271,8 +236,6 @@
* Populates given {@link InstrumentationApkTest} with data from the package xml.
*
* @param testCaseDir
- * @param className
- * @param methodName
* @param instrTest
* @return the populated {@link InstrumentationTest} or <code>null</code>
*/
@@ -324,9 +287,9 @@
}
/**
- * Add a {@link TestDef} to the list of tests in this package.
+ * Add a {@link TestIdentifier} to the list of tests in this package.
*
- * @param testdef
+ * @param testDef
*/
void addTest(TestIdentifier testDef) {
mTests.add(testDef);
@@ -367,7 +330,8 @@
MessageDigest md = MessageDigest.getInstance(algorithm);
d = new DigestInputStream(fileStream, md);
byte[] buffer = new byte[8196];
- while (d.read(buffer) != -1);
+ while (d.read(buffer) != -1) {
+ }
return toHexString(md.digest());
} catch (NoSuchAlgorithmException e) {
return algorithm + " not found";
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
index 77fa996..0f3704d 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
@@ -38,19 +38,22 @@
private static final String LOG_TAG = "TestCaseRepo";
- private File mTestCaseDir;
+ private final File mTestCaseDir;
/** mapping of uri to test definition */
- private Map<String, TestPackageDef> mTestMap;
+ private final Map<String, TestPackageDef> mTestMap;
+
+ private final boolean mIncludeKnownFailures;
/**
* Creates a {@link TestPackageRepo}, initialized from provided repo files
*
* @param testCaseDir directory containing all test case definition xml and build files
*/
- public TestPackageRepo(File testCaseDir) {
+ public TestPackageRepo(File testCaseDir, boolean includeKnownFailures) {
mTestCaseDir = testCaseDir;
mTestMap = new Hashtable<String, TestPackageDef>();
+ mIncludeKnownFailures = includeKnownFailures;
parse(mTestCaseDir);
}
@@ -64,12 +67,8 @@
}
}
- /**
- * @param xmlFile
- * @throws ParseException
- */
private void parseTestFromXml(File xmlFile) {
- TestPackageXmlParser parser = new TestPackageXmlParser();
+ TestPackageXmlParser parser = new TestPackageXmlParser(mIncludeKnownFailures);
try {
parser.parse(createStreamFromFile(xmlFile));
TestPackageDef def = parser.getTestPackageDef();
@@ -96,7 +95,7 @@
* Exposed for unit testing
*
* @param xmlFile
- * @return
+ * @return stream to read data
*
*/
InputStream createStreamFromFile(File xmlFile) throws FileNotFoundException {
@@ -108,6 +107,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean accept(File dir, String name) {
return name.endsWith(".xml");
}
@@ -135,9 +135,9 @@
}
/**
- * Return a list of all package names found in repo.
- * @return
+ * @return list of all package names found in repo
*/
+ @Override
public Collection<String> getPackageNames() {
List<String> packageNames = new ArrayList<String>();
packageNames.addAll(mTestMap.keySet());
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java
index f1b6ed0..35bdfd2 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java
@@ -20,7 +20,6 @@
import com.android.tradefed.util.xml.AbstractXmlParser;
import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import java.util.Iterator;
@@ -36,8 +35,14 @@
private static final String LOG_TAG = "TestPackageXmlParser";
+ private final boolean mIncludeKnownFailures;
+
private TestPackageDef mPackageDef;
+ public TestPackageXmlParser(boolean includeKnownFailures) {
+ mIncludeKnownFailures = includeKnownFailures;
+ }
+
/**
* SAX callback object. Handles parsing data from the xml tags.
* <p/>
@@ -58,22 +63,15 @@
private Stack<String> mClassNameStack = new Stack<String>();
@Override
- public void startElement(String uri, String localName, String name, Attributes attributes)
- throws SAXException {
+ public void startElement(String uri, String localName, String name, Attributes attributes) {
if (TEST_PACKAGE_TAG.equals(localName)) {
// appPackageName is used as the uri
final String entryUriValue = attributes.getValue("appPackageName");
final String testPackageNameSpace = attributes.getValue("appNameSpace");
final String packageName = attributes.getValue("name");
final String runnerName = attributes.getValue("runner");
- final String hostSideTest = attributes.getValue("hostSideOnly");
- final String vmHostTest = attributes.getValue("vmHostTest");
- final String testType = attributes.getValue("testType");
final String jarPath = attributes.getValue("jarPath");
final String signatureCheck = attributes.getValue("signatureCheck");
- final String referenceApp = attributes.getValue("referenceAppTest");
- final String apkToTest = attributes.getValue("apkToTestName");
- final String packageToTest = attributes.getValue("packageToTest");
final String javaPackageFilter = attributes.getValue("javaPackageFilter");
final String targetBinaryName = attributes.getValue("targetBinaryName");
final String targetNameSpace = attributes.getValue("targetNameSpace");
@@ -83,14 +81,9 @@
mPackageDef.setAppNameSpace(testPackageNameSpace);
mPackageDef.setName(packageName);
mPackageDef.setRunner(runnerName);
- mPackageDef.setIsHostSideTest(parseBoolean(hostSideTest));
- mPackageDef.setIsVMHostTest(parseBoolean(vmHostTest));
- mPackageDef.setTestType(testType);
+ mPackageDef.setTestType(getTestType(attributes));
mPackageDef.setJarPath(jarPath);
mPackageDef.setIsSignatureCheck(parseBoolean(signatureCheck));
- mPackageDef.setIsReferenceApp(parseBoolean(referenceApp));
- mPackageDef.setApkToTest(apkToTest);
- mPackageDef.setPackageToTest(packageToTest);
mPackageDef.setTestPackageName(javaPackageFilter);
mPackageDef.setTargetBinaryName(targetBinaryName);
mPackageDef.setTargetNameSpace(targetNameSpace);
@@ -131,16 +124,30 @@
classNameBuilder.append(".");
}
}
- TestIdentifier testdef = new TestIdentifier(classNameBuilder.toString(),
+
+ TestIdentifier testId = new TestIdentifier(classNameBuilder.toString(),
methodName);
- mPackageDef.addTest(testdef);
+ boolean isKnownFailure = "failure".equals(attributes.getValue("expectation"));
+ if (!isKnownFailure || mIncludeKnownFailures) {
+ mPackageDef.addTest(testId);
+ }
}
}
}
+ private String getTestType(Attributes attributes) {
+ if (parseBoolean(attributes.getValue("hostSideOnly"))) {
+ return TestPackageDef.HOST_SIDE_ONLY_TEST;
+ } else if (parseBoolean(attributes.getValue("vmHostTest"))) {
+ return TestPackageDef.VM_HOST_TEST;
+ } else {
+ return attributes.getValue("testType");
+ }
+ }
+
@Override
- public void endElement (String uri, String localName, String qName) throws SAXException {
+ public void endElement (String uri, String localName, String qName) {
if (TEST_SUITE_TAG.equals(localName) || TEST_CASE_TAG.equals(localName)) {
mClassNameStack.pop();
}
diff --git a/tools/tradefed-host/tests/.classpath b/tools/tradefed-host/tests/.classpath
index b130096..10ad23c 100644
--- a/tools/tradefed-host/tests/.classpath
+++ b/tools/tradefed-host/tests/.classpath
@@ -3,9 +3,9 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry combineaccessrules="false" kind="src" path="/easymock"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
<classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
<classpathentry combineaccessrules="false" kind="src" path="/cts-tradefed-host"/>
+ <classpathentry kind="var" path="CTS_SRC_ROOT/out/host/common/obj/JAVA_LIBRARIES/easymock_intermediates/javalib.jar" sourcepath="/CTS_SRC_ROOT/external/easymock/src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tools/tradefed-host/tests/run_unit_tests.sh b/tools/tradefed-host/tests/run_unit_tests.sh
new file mode 100755
index 0000000..fc19a02
--- /dev/null
+++ b/tools/tradefed-host/tests/run_unit_tests.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# helper script for running the cts-tradefed unit tests
+
+checkFile() {
+ if [ ! -f "$1" ]; then
+ echo "Unable to locate $1"
+ exit
+ fi;
+}
+
+# check if in Android build env
+if [ ! -z ${ANDROID_BUILD_TOP} ]; then
+ HOST=`uname`
+ if [ "$HOST" == "Linux" ]; then
+ OS="linux-x86"
+ elif [ "$HOST" == "Darwin" ]; then
+ OS="darwin-x86"
+ else
+ echo "Unrecognized OS"
+ exit
+ fi;
+fi;
+
+JAR_DIR=${ANDROID_BUILD_TOP}/out/host/$OS/framework
+JARS="ddmlib-prebuilt.jar tradefed-prebuilt.jar hosttestlib.jar cts-tradefed.jar cts-tradefed-tests.jar"
+
+for JAR in $JARS; do
+ checkFile ${JAR_DIR}/${JAR}
+ JAR_PATH=${JAR_PATH}:${JAR_DIR}/${JAR}
+done
+
+java $RDBG_FLAG \
+ -cp ${JAR_PATH} com.android.tradefed.command.Console run singleCommand host -n --class com.android.cts.tradefed.UnitTests "$@"
+
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java
index 0dc7257..7dfac13 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java
@@ -16,9 +16,14 @@
package com.android.cts.tradefed;
import com.android.cts.tradefed.result.CtsXmlResultReporterTest;
+import com.android.cts.tradefed.result.DeviceInfoResultTest;
+import com.android.cts.tradefed.result.TestPackageResultTest;
+import com.android.cts.tradefed.result.TestResultsTest;
+import com.android.cts.tradefed.result.TestSummaryXmlTest;
import com.android.cts.tradefed.result.TestTest;
import com.android.cts.tradefed.testtype.CtsTestTest;
import com.android.cts.tradefed.testtype.JarHostTestTest;
+import com.android.cts.tradefed.testtype.TestFilterTest;
import com.android.cts.tradefed.testtype.TestPackageDefTest;
import com.android.cts.tradefed.testtype.TestPackageXmlParserTest;
import com.android.cts.tradefed.testtype.TestPlanTest;
@@ -36,13 +41,22 @@
public UnitTests() {
super();
+
+ // result package
addTestSuite(CtsXmlResultReporterTest.class);
- addTestSuite(JarHostTestTest.class);
- addTestSuite(CtsTestTest.class);
- addTestSuite(TestPlanTest.class);
- addTestSuite(TestPackageXmlParserTest.class);
- addTestSuite(TestPackageDefTest.class);
+ addTestSuite(DeviceInfoResultTest.class);
+ addTestSuite(TestPackageResultTest.class);
+ addTestSuite(TestResultsTest.class);
+ addTestSuite(TestSummaryXmlTest.class);
addTestSuite(TestTest.class);
+
+ // testtype package
+ addTestSuite(CtsTestTest.class);
+ addTestSuite(JarHostTestTest.class);
+ addTestSuite(TestFilterTest.class);
+ addTestSuite(TestPackageDefTest.class);
+ addTestSuite(TestPackageXmlParserTest.class);
+ addTestSuite(TestPlanTest.class);
}
public static Test suite() {
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
index 94b7344..9515446 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
@@ -66,6 +66,8 @@
mReportDir = FileUtil.createTempDir("foo");
mResultReporter.setReportDir(mReportDir);
mMockBuild = EasyMock.createNiceMock(IFolderBuildInfo.class);
+ EasyMock.expect(mMockBuild.getDeviceSerial()).andStubReturn(null);
+ EasyMock.replay(mMockBuild);
}
@Override
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/DeviceInfoResultTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/DeviceInfoResultTest.java
index a0388b2..fa36430 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/DeviceInfoResultTest.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/DeviceInfoResultTest.java
@@ -15,20 +15,22 @@
*/
package com.android.cts.tradefed.result;
-import android.tests.getinfo.DeviceInfoConstants;
-
-import junit.framework.TestCase;
+import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
import org.kxml2.io.KXmlSerializer;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
+import android.tests.getinfo.DeviceInfoConstants;
+
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestCase;
+
/**
* Unit tests for {@link DeviceInfoResult}
*/
@@ -55,31 +57,40 @@
};
}
- /**
- * Test the roundtrip setting of device process details, serializing and parsing from/to XML.
- */
- public void testProcess() throws Exception {
- final String processString = "ueventd;netd;";
- DeviceInfoResult serializedInfo = new DeviceInfoResult();
- addMetric(DeviceInfoConstants.PROCESSES, processString, serializedInfo);
- String serializedOutput = serialize(serializedInfo);
- mDeserializingInfo.parse(new StringReader(serializedOutput));
- assertEquals(processString, mDeserializingInfo.getMetrics().get(
- DeviceInfoConstants.PROCESSES));
+ public void testFeatures() throws Exception {
+ assertSerializeParse(DeviceInfoConstants.FEATURES, "");
+ assertSerializeParse(DeviceInfoConstants.FEATURES,
+ "android.hardware.audio.low_latency:sdk:false;");
+ assertSerializeParse(DeviceInfoConstants.FEATURES, "android.hardware.audio.low_latency:"
+ + "sdk:false;android.hardware.bluetooth:sdk:true;");
}
- /**
- * Test the roundtrip setting of device feature details, serializing and parsing from/to XML.
- */
- public void testFeature() throws Exception {
- final String featureString =
- "android.hardware.audio.low_latency:sdk:false;android.hardware.bluetooth:sdk:true;";
+ public void testProcesses() throws Exception {
+ assertSerializeParse(DeviceInfoConstants.PROCESSES, "");
+ assertSerializeParse(DeviceInfoConstants.PROCESSES, "ueventd:0;");
+ assertSerializeParse(DeviceInfoConstants.PROCESSES, "ueventd:0;netd:0;");
+ }
+
+ public void testOpenGlTextureFormats() throws Exception {
+ assertSerializeParse(DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS, "");
+ assertSerializeParse(DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS, "texture1;");
+ assertSerializeParse(DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS,
+ "texture1;texture2;");
+ }
+
+ public void testSystemLibraries() throws Exception {
+ assertSerializeParse(DeviceInfoConstants.SYS_LIBRARIES, "");
+ assertSerializeParse(DeviceInfoConstants.SYS_LIBRARIES, "lib1;");
+ assertSerializeParse(DeviceInfoConstants.SYS_LIBRARIES, "lib1;lib2;");
+ }
+
+ private void assertSerializeParse(String name, String value)
+ throws IOException, ParseException {
DeviceInfoResult serializedInfo = new DeviceInfoResult();
- addMetric(DeviceInfoConstants.FEATURES, featureString, serializedInfo);
+ addMetric(name, value, serializedInfo);
String serializedOutput = serialize(serializedInfo);
mDeserializingInfo.parse(new StringReader(serializedOutput));
- assertEquals(featureString, mDeserializingInfo.getMetrics().get(
- DeviceInfoConstants.FEATURES));
+ assertEquals(value, mDeserializingInfo.getMetrics().get(name));
}
/**
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/TestPackageXmlParserTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/TestPackageXmlParserTest.java
index b24c0e3..ac3d394 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/TestPackageXmlParserTest.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/TestPackageXmlParserTest.java
@@ -42,7 +42,7 @@
" <TestSuite name=\"example\" >\n" +
" <TestCase name=\"ExampleTest\" >\n" +
" <Test name=\"testFoo\" />\n" +
- " <Test name=\"testFoo2\" />\n" +
+ " <Test name=\"testFoo2\" expectation=\"failure\" />\n" +
" </TestCase>\n" +
" </TestSuite>\n" +
" <TestSuite name=\"example2\" >\n" +
@@ -57,6 +57,10 @@
"<TestPackage hostSideOnly=\"blah\" >" +
"</TestPackage>";
+ private static String VM_HOST_TEST_XML = "<TestPackage vmHostTest=\"true\"></TestPackage>";
+
+ private static String NATIVE_TEST_XML = "<TestPackage testType=\"native\"></TestPackage>";
+
private static String NO_TEST_DATA =
"<invalid />";
@@ -64,7 +68,7 @@
* Test parsing test case xml containing an instrumentation test definition.
*/
public void testParse_instrPackage() throws ParseException {
- TestPackageXmlParser parser = new TestPackageXmlParser();
+ TestPackageXmlParser parser = new TestPackageXmlParser(true);
parser.parse(getStringAsStream(INSTR_TEST_DATA));
TestPackageDef def = parser.getTestPackageDef();
assertEquals("com.example", def.getAppNameSpace());
@@ -76,10 +80,10 @@
* Test parsing test case xml containing an host test attribute and test data.
*/
public void testParse_hostTest() throws ParseException {
- TestPackageXmlParser parser = new TestPackageXmlParser();
+ TestPackageXmlParser parser = new TestPackageXmlParser(true);
parser.parse(getStringAsStream(HOST_TEST_DATA));
TestPackageDef def = parser.getTestPackageDef();
- assertTrue(def.isHostSideTest());
+ assertEquals(TestPackageDef.HOST_SIDE_ONLY_TEST, def.getTestType());
assertEquals(3, def.getTests().size());
Iterator<TestIdentifier> iterator = def.getTests().iterator();
@@ -94,23 +98,59 @@
TestIdentifier thirdTest = iterator.next();
assertEquals("com.example2.Example2Test", thirdTest.getClassName());
assertEquals("testFoo", thirdTest.getTestName());
+
+ assertFalse(iterator.hasNext());
+ }
+
+ public void testParse_hostTest_noKnownFailures() throws ParseException {
+ TestPackageXmlParser parser = new TestPackageXmlParser(false);
+ parser.parse(getStringAsStream(HOST_TEST_DATA));
+ TestPackageDef def = parser.getTestPackageDef();
+ assertEquals(TestPackageDef.HOST_SIDE_ONLY_TEST, def.getTestType());
+ assertEquals(2, def.getTests().size());
+ Iterator<TestIdentifier> iterator = def.getTests().iterator();
+
+ TestIdentifier firstTest = iterator.next();
+ assertEquals("com.example.ExampleTest", firstTest.getClassName());
+ assertEquals("testFoo", firstTest.getTestName());
+
+ TestIdentifier thirdTest = iterator.next();
+ assertEquals("com.example2.Example2Test", thirdTest.getClassName());
+ assertEquals("testFoo", thirdTest.getTestName());
+
+ assertFalse(iterator.hasNext());
}
/**
* Test parsing test case xml containing an invalid host test attribute.
*/
public void testParse_badHostTest() throws ParseException {
- TestPackageXmlParser parser = new TestPackageXmlParser();
+ TestPackageXmlParser parser = new TestPackageXmlParser(true);
parser.parse(getStringAsStream(BAD_HOST_TEST_DATA));
TestPackageDef def = parser.getTestPackageDef();
- assertFalse(def.isHostSideTest());
+ assertFalse(TestPackageDef.HOST_SIDE_ONLY_TEST.equals(def.getTestType()));
+ }
+
+ public void testParse_vmHostTest() throws ParseException {
+ assertTestType(TestPackageDef.VM_HOST_TEST, VM_HOST_TEST_XML);
+ }
+
+ public void testParse_nativeTest() throws ParseException {
+ assertTestType(TestPackageDef.NATIVE_TEST, NATIVE_TEST_XML);
+ }
+
+ private void assertTestType(String expectedType, String xml) throws ParseException {
+ TestPackageXmlParser parser = new TestPackageXmlParser(true);
+ parser.parse(getStringAsStream(xml));
+ TestPackageDef def = parser.getTestPackageDef();
+ assertEquals(expectedType, def.getTestType());
}
/**
* Test parsing a test case xml with no test package data.
*/
public void testParse_noData() throws ParseException {
- TestPackageXmlParser parser = new TestPackageXmlParser();
+ TestPackageXmlParser parser = new TestPackageXmlParser(true);
parser.parse(getStringAsStream(NO_TEST_DATA));
assertNull(parser.getTestPackageDef());
}
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 98978fd..60c9084 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -74,22 +74,16 @@
def GenerateTestDescriptions(self):
"""Generate test descriptions for all packages."""
- pool = Pool(processes=16)
+ pool = Pool(processes=2)
# individually generate descriptions not following conventions
pool.apply_async(GenerateSignatureCheckDescription, [self.test_repository])
- pool.apply_async(GenerateReferenceAppDescription, [self.test_repository])
- pool.apply_async(GenerateAppSecurityDescription, [self.temp_dir,
- self.test_repository, self.android_root, self.doclet_path])
# generate test descriptions for android tests
- android_packages = GetSubDirectories(self.test_root)
- for package in android_packages:
- pool.apply_async(GenerateTestDescription, [self.test_root, self.temp_dir,
- self.test_repository, self.android_root, self.doclet_path, package])
-
+ results = []
pool.close()
pool.join()
+ return sum(map(lambda result: result.get(), results))
def __WritePlan(self, plan, plan_name):
print 'Generating test plan %s' % plan_name
@@ -106,11 +100,9 @@
packages.append(doc.GetAttr('TestPackage', 'appPackageName'))
plan = tools.TestPlan(packages)
- plan.Exclude('android\.core\.vm-tests')
plan.Exclude('android\.performance.*')
- plan.Include(r'android\.core\.vm-tests-tf')
- self.__WritePlan(plan, 'CTS-TF')
self.__WritePlan(plan, 'CTS')
+ self.__WritePlan(plan, 'CTS-TF')
plan.Exclude(r'android\.tests\.sigtest')
plan.Exclude(r'android\.core.*')
@@ -129,10 +121,6 @@
self.__WritePlan(plan, 'Signature')
plan = tools.TestPlan(packages)
- plan.Include(r'android\.apidemos\.cts')
- self.__WritePlan(plan, 'RefApp')
-
- plan = tools.TestPlan(packages)
plan.Include(r'android\.tests\.appsecurity')
self.__WritePlan(plan, 'AppSecurity')
@@ -151,162 +139,9 @@
package.WriteDescription(description)
description.close()
-def GenerateReferenceAppDescription(test_repository):
- """Generate the test description for the reference app tests."""
- LogGenerateDescription('android.apidemos.cts')
- package = tools.TestPackage('ApiDemosReferenceTest', 'android.apidemos.cts')
- package.AddAttribute('appNameSpace', 'android.apidemos.cts')
- package.AddAttribute('packageToTest', 'com.example.android.apis')
- package.AddAttribute('apkToTestName', 'ApiDemos')
- package.AddAttribute('runner', 'android.test.InstrumentationTestRunner')
- package.AddAttribute('referenceAppTest', 'true')
- package.AddTest('android.apidemos.cts.ApiDemosTest.testNumberOfItemsInListView')
- description = open(os.path.join(test_repository, 'ApiDemosReferenceTest.xml'), 'w')
- package.WriteDescription(description)
- description.close()
-
-def GenerateAppSecurityDescription(temp_dir, test_repository, android_root, doclet_path):
- """Generate the test description for the application security tests."""
- test_root = 'cts/tests/appsecurity-tests'
- makefile_name = os.path.join(test_root, 'Android.mk')
- makefile_vars = GetMakeFileVars(makefile_name)
- name = makefile_vars['LOCAL_MODULE']
- package_name = 'android.tests.appsecurity'
- LogGenerateDescription(package_name)
- temp_desc = os.path.join(temp_dir, 'description.xml')
- RunDescriptionGeneratorDoclet(android_root, doclet_path,
- os.path.join(test_root, 'src'), temp_desc)
- doc = dom.parse(temp_desc)
- test_description = doc.getElementsByTagName('TestPackage')[0]
- test_description.setAttribute('name', package_name)
- test_description.setAttribute('appPackageName', package_name)
- test_description.setAttribute('hostSideOnly', 'true')
- test_description.setAttribute('jarPath', name + '.jar')
- description = open(os.path.join(test_repository, package_name + '.xml'), 'w')
- doc.writexml(description, addindent=' ', encoding='UTF-8')
- description.close()
-
-
-def GenerateTestDescription(test_root, temp_dir, test_repository, android_root,
- doclet_path, package):
-
- app_package_name = 'android.' + package
- package_root = os.path.join(test_root, package)
-
- makefile_name = os.path.join(package_root, 'Android.mk')
- if not os.path.exists(makefile_name):
- print 'Skipping directory "%s" due to missing Android.mk' % package_root
- return
- makefile_vars = GetMakeFileVars(makefile_name)
-
- manifest_name = os.path.join(package_root, 'AndroidManifest.xml')
- if not os.path.exists(manifest_name):
- print 'Skipping directory "%s" due to missing AndroidManifest.xml' % package_root
- return
- manifest = tools.XmlFile(manifest_name)
-
- LogGenerateDescription(app_package_name)
-
- # Run the description generator doclet to get the test package structure
- # TODO: The Doclet does not currently add all required attributes. Instead of rewriting
- # the document below, additional attributes should be passed to the Doclet as arguments.
- temp_desc = os.path.join(temp_dir, app_package_name + '-description.xml')
-
- RunDescriptionGeneratorDoclet(android_root, doclet_path, package_root, temp_desc)
-
- # obtain missing attribute values from the makefile and manifest
- package_name = makefile_vars['LOCAL_PACKAGE_NAME']
- runner = manifest.GetAndroidAttr('instrumentation', 'name')
- target_package = manifest.GetAndroidAttr('instrumentation', 'targetPackage')
- target_binary_name = makefile_vars.get('LOCAL_INSTRUMENTATION_FOR')
-
- # add them to the document
- doc = dom.parse(temp_desc)
- test_description = doc.getElementsByTagName('TestPackage')[0]
- test_description.setAttribute('name', package_name)
- test_description.setAttribute('runner', runner)
- test_package = manifest.GetAttr('manifest', 'package')
- test_description.setAttribute('appNameSpace', test_package)
- test_description.setAttribute('appPackageName', app_package_name)
- if not test_package == target_package:
- test_description.setAttribute('targetNameSpace', target_package)
- test_description.setAttribute('targetBinaryName', target_binary_name)
- description = open(os.path.join(test_repository, package_name + '.xml'), 'w')
- doc.writexml(description, addindent=' ', encoding='UTF-8')
- description.close()
-
-def RunDescriptionGeneratorDoclet(android_root, doclet_path, source_root, output_file):
- """Generate a test package description by running the DescriptionGenerator doclet.
-
- Args:
- android_root: Root directory of the Android source tree.
- doclet_path: Class path where the DescriptionGenerator doclet can be found.
- source_root: Directory under which tests should be searched.
- output_file: Name of the file where the description gets written.
-
- Returns:
- The exit code of the DescriptionGenerator doclet run.
- """
- # Make sure sourceRoot is relative to self.android_root
- source_root = RelPath(source_root, android_root)
-
- # To determine whether a class is a JUnit test, the Doclet needs to have all intermediate
- # subclasses of TestCase as well as the JUnit framework itself on the source path.
- # Annotation classes are also required, since test annotations go into the description.
- sourcepath = [
- 'frameworks/base/core/java', # android test classes
- 'frameworks/base/test-runner/src', # test runner
- 'libcore/junit/src/main/java', # junit classes
- 'development/tools/hosttestlib/src', # hosttestlib TestCase extensions
- 'libcore/dalvik/src/main/java', # test annotations
- 'cts/tests/src', # cts test stubs
- source_root # the source for this package
- ]
- sourcepath = [os.path.join(android_root, x) for x in sourcepath]
- classpath = [
- 'prebuilt/common/tradefed/tradefed-prebuilt.jar',
- ]
- classpath = [os.path.join(android_root, x) for x in classpath]
- cmd = ('javadoc -o %s -J-Xmx512m -quiet -doclet DescriptionGenerator -docletpath %s'
- ' -sourcepath %s -classpath %s ') % (output_file, doclet_path, ':'.join(sourcepath),
- ':'.join(classpath))
- sources = []
-
- def AddFile(sources, folder, names):
- """Find *.java."""
- sources.extend([os.path.join(folder, name) for name in names if name.endswith('.java')])
-
- os.path.walk(os.path.join(android_root, source_root), AddFile, sources)
- cmd += ' '.join(sources)
- proc = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
- # read and discard any output
- proc.communicate()
- # wait for process to terminate and return exit value
- return proc.wait()
-
-def RelPath(path, start=os.getcwd()):
- """Get a relative version of a path.
-
- This is equivalent to os.path.relpath, which is only available since Python 2.6.
-
- Args:
- path: The path to transform.
- start: The base path. Defaults to the current working directory.
-
- Returns:
- A transformed path that is relative to start.
- """
- path_dirs = os.path.abspath(path).split(os.path.sep)
- start_dirs = os.path.abspath(start).split(os.path.sep)
-
- num_common = len(os.path.commonprefix([start_dirs, path_dirs]))
-
- result_dirs = ['..'] * (len(start_dirs) - num_common) + path_dirs[num_common:]
- if result_dirs:
- return os.path.join(*result_dirs)
- return start
-
if __name__ == '__main__':
builder = CtsBuilder(sys.argv)
- builder.GenerateTestDescriptions()
+ result = builder.GenerateTestDescriptions()
+ if result != 0:
+ sys.exit(result)
builder.GenerateTestPlans()
diff --git a/tools/utils/host_config.xml b/tools/utils/host_config.xml
deleted file mode 100644
index 1a99e75..0000000
--- a/tools/utils/host_config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<HostConfiguration version="1.0">
- <Repository>
- <!-- Specific OEM test plan directory (optional) -->
- <TestPlan path="plans" />
- <!-- Specific OEM test case directory (optional) -->
- <TestCase path="testcases" />
- <!-- Specific OEM test result directory (optional) -->
- <TestResult path="results" />
- </Repository>
-
- <!-- Number of tests executed between reboots. A value <= 0 disables reboots. -->
- <IntValue name="maxTestCount" value="200" />
- <!-- Max size [tests] for a package to be run in batch mode. -->
- <IntValue name="maxTestsInBatchMode" value="5000" />
-
- <!-- Max time [ms] between test status updates. -->
- <IntValue name="testStatusTimeoutMs" value="600000" />
- <!-- Max time [ms] from start of package in batch mode and the first test status update. -->
- <IntValue name="batchStartTimeoutMs" value="1800000" />
- <!-- Max time [ms] from start of test in individual mode to the first test status update. -->
- <IntValue name="individualStartTimeoutMs" value="600000" />
- <!-- Timeout [ms] for the signature check. -->
- <IntValue name="signatureTestTimeoutMs" value="600000" />
- <!-- Timeout [ms] for package installations. -->
- <IntValue name="packageInstallTimeoutMs" value="120000" />
- <!-- Time to wait [ms] after a package installation or removal. -->
- <IntValue name="postInstallWaitMs" value="10000" />
-
-</HostConfiguration>
diff --git a/tools/utils/startcts b/tools/utils/startcts
deleted file mode 100755
index 4db28b2..0000000
--- a/tools/utils/startcts
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/bash
-
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ -z "${CTS_ROOT}" ]; then
-# CONFIGURATION
-# Set this variable to the root of unzipped CTS directory
-# This only needs to be changed if this script has been moved
-CTS_ROOT="$(dirname $0)/.."
-fi;
-
-# ----------------------------------------------------------------------------
-# END OF CONFIGURATION SECTION
-# ----------------------------------------------------------------------------
-
-checkDir() {
- if [ ! -d $1 ]; then
- echo "$2"
- exit
- fi;
-}
-
-
-checkFile() {
- if [ ! -f "$1" ]; then
- echo "Unable to locate $1."
- exit
- fi;
-}
-
-checkPath() {
- if ! type -P $1 &> /dev/null; then
- echo "Unable to find $1 in path."
- exit
- fi;
-}
-
-checkDir ${CTS_ROOT} "Error: Cannot locate CTS in \"${CTS_DIR}\". Please check your configuration in $0"
-
-DDM_LIB=${CTS_ROOT}/tools/ddmlib-prebuilt.jar
-CTS_LIB=${CTS_ROOT}/tools/cts.jar
-JUNIT_LIB=${CTS_ROOT}/tools/junit.jar
-HOSTTEST_LIB=${CTS_ROOT}/tools/hosttestlib.jar
-
-checkFile ${DDM_LIB}
-checkFile ${CTS_LIB}
-checkFile ${JUNIT_LIB}
-checkFile ${HOSTTEST_LIB}
-
-JARS=${CTS_LIB}:${DDM_LIB}:${JUNIT_LIB}:${HOSTTEST_LIB}
-
-# Add SDK_ROOT to the PATH for backwards compatibility with prior startcts
-# commands that required SDK_ROOT to find adb.
-if [ -n "${SDK_ROOT}" ]; then
- PATH=${SDK_ROOT}/platform-tools:${SDK_ROOT}/tools:${PATH}
-fi
-
-checkPath adb
-
-# options for the JVM
-JAVA_OPTS="-Xmx512M"
-# configuration supplied as single argument
-CONFIG=
-# configuration supplied with --config option
-DDCONFIG=
-
-if [ $# -eq 1 ]; then
- # single argument specifies configuration file
- :
-else
- if [ $(echo "$*" | grep -c -e --config -) -gt 0 ]; then
- # --config supplied on command line
- :
- else
- if [ $# -eq 0 ]; then
- # no arguments; supply config as single argument
- CONFIG=${CTS_ROOT}/repository/host_config.xml
- else
- # no config; append --config to existing command line
- DDCONFIG="--config ${CTS_ROOT}/repository/host_config.xml"
- fi;
- fi;
-fi;
-
-java ${JAVA_OPTS} -cp ${JARS} com.android.cts.TestHost ${CONFIG} "$@" ${DDCONFIG}
diff --git a/tools/vm-tests-tf/Android.mk b/tools/vm-tests-tf/Android.mk
index bfc47d7..07a3cf8 100644
--- a/tools/vm-tests-tf/Android.mk
+++ b/tools/vm-tests-tf/Android.mk
@@ -31,7 +31,7 @@
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := dx dasm cfassembler
+LOCAL_JAVA_LIBRARIES := dx dasm cfassembler junit
LOCAL_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
include $(BUILD_HOST_JAVA_LIBRARY)
@@ -63,7 +63,7 @@
$(GENERATED_FILES): PRIVATE_INTERMEDIATES := $(intermediates)/tests
$(GENERATED_FILES): PRIVATE_INTERMEDIATES_MAIN_FILES := $(intermediates)/main_files
$(GENERATED_FILES): PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES := $(intermediates)/hostjunit_files
-$(GENERATED_FILES): $(HOST_OUT_JAVA_LIBRARIES)/cts-tf-dalvik-buildutil.jar $(HOST_OUT_JAVA_LIBRARIES)/dasm.jar $(HOST_OUT_JAVA_LIBRARIES)/dx.jar $(HOST_OUT_JAVA_LIBRARIES)/cfassembler.jar
+$(GENERATED_FILES): $(HOST_OUT_JAVA_LIBRARIES)/cts-tf-dalvik-buildutil.jar $(HOST_OUT_JAVA_LIBRARIES)/dasm.jar $(HOST_OUT_JAVA_LIBRARIES)/dx.jar $(HOST_OUT_JAVA_LIBRARIES)/cfassembler.jar $(HOST_OUT_JAVA_LIBRARIES)/junit.jar
$(hide) mkdir -p $@
$(hide) mkdir -p $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES)/dot/junit
diff --git a/tools/vm-tests/Android.mk b/tools/vm-tests/Android.mk
deleted file mode 100644
index f807774..0000000
--- a/tools/vm-tests/Android.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-define all-src-files
-$(patsubst ./%,%,$(shell cd $(LOCAL_PATH) && find src -name '*.java'))
-endef
-
-# buildutil java library
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_TEST_TYPE := hostSideOnly
-LOCAL_JAR_PATH := android.core.vm-tests.jar
-
-LOCAL_SRC_FILES := $(call all-src-files)
-
-LOCAL_MODULE := cts-dalvik-buildutil
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-LOCAL_JAVA_LIBRARIES := dx dasm cfassembler hosttestlib ddmlib
-LOCAL_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-$(LOCAL_BUILT_MODULE): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates)/classes
-
-BUILD_UTIL_INTERMEDIATES_CLASSES := $(intermediates)/classes
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := vm-tests
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/starttests | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-new-target)
- $(hide) chmod 755 $@
-
-GENERATED_FILES:=$(intermediates)/tests
-
-$(LOCAL_BUILT_MODULE): $(GENERATED_FILES)
-
-colon:= :
-empty:=
-space:= $(empty) $(empty)
-
-
-$(GENERATED_FILES): PRIVATE_SRC_FOLDER := $(LOCAL_PATH)/src
-$(GENERATED_FILES): PRIVATE_LIB_FOLDER := $(LOCAL_PATH)/lib
-$(GENERATED_FILES): PRIVATE_INTERMEDIATES := $(intermediates)/tests
-$(GENERATED_FILES): PRIVATE_INTERMEDIATES_MAIN_FILES := $(intermediates)/main_files
-$(GENERATED_FILES): PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES := $(intermediates)/hostjunit_files
-$(GENERATED_FILES): $(HOST_OUT_JAVA_LIBRARIES)/cts-dalvik-buildutil.jar $(HOST_OUT_JAVA_LIBRARIES)/dasm.jar $(HOST_OUT_JAVA_LIBRARIES)/dx.jar $(HOST_OUT_JAVA_LIBRARIES)/cfassembler.jar $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar $(HOST_OUT_JAVA_LIBRARIES)/ddmlib.jar
-
- $(hide) mkdir -p $@
-# copy Util class to compile later together with the generated host side junit tests
- $(hide) mkdir -p $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES)/dot/junit && cp $(PRIVATE_SRC_FOLDER)/util/build/DeviceUtil.java.template $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES)/dot/junit/DeviceUtil.java
-# generated and compile the host side junit tests
- $(hide) java -cp $(subst $(space),$(colon),$^):$(HOST_JDK_TOOLS_JAR) util.build.BuildDalvikSuite $(PRIVATE_SRC_FOLDER) $(PRIVATE_INTERMEDIATES) $<:$(PRIVATE_LIB_FOLDER)/junit.jar:$(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar:$(HOST_OUT_JAVA_LIBRARIES)/ddmlib.jar $(PRIVATE_INTERMEDIATES_MAIN_FILES) $(BUILD_UTIL_INTERMEDIATES_CLASSES) $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES) $$RUN_VM_TESTS_RTO
- @echo "wrote generated Main_*.java files to $(PRIVATE_INTERMEDIATES_MAIN_FILES)"
-INSTALLED_TESTS := $(dir $(LOCAL_INSTALLED_MODULE))../cts_dalviktests/timestamp
-
-$(LOCAL_BUILT_MODULE): $(INSTALLED_TESTS)
-
-$(INSTALLED_TESTS): PRIVATE_INTERMEDIATES := $(intermediates)/tests
-$(INSTALLED_TESTS): $(GENERATED_FILES) $(GENERATED_FILES)/dot/junit/dexcore.jar
- $(hide) mkdir -p $(dir $@)tests
- $(hide) $(ACP) -r $(PRIVATE_INTERMEDIATES)/dot $(dir $@)tests
- $(hide) $(ACP) -r $(PRIVATE_INTERMEDIATES)/data $(dir $@)
- @touch $@
-
-$(intermediates)/android.core.vm-tests.jar: PRIVATE_INTERMEDIATES := $(intermediates)
-$(intermediates)/android.core.vm-tests.jar: $(INSTALLED_TESTS)
- $(hide) cd $(PRIVATE_INTERMEDIATES)/hostjunit_files/classes && \
- zip -q -r ../../android.core.vm-tests.jar . && \
- cd -
- $(hide) cd $(PRIVATE_INTERMEDIATES) && \
- zip -q -r android.core.vm-tests.jar tests && \
- cd -
-
-
-define get-class-path
- $(BUILD_UTIL_INTERMEDIATES_CLASSES)/$(strip $(1))
-endef
-
-define dex-classes
- @mkdir -p $(dir $@)
- @jar -cf $(dir $@)/$(notdir $@).jar $(addprefix -C $(1) ,$(2))
- $(hide) $(DX) -JXms16M -JXmx768M \
- --dex --output=$@ \
- $(if $(NO_OPTIMIZE_DX), \
- --no-optimize) \
- $(dir $@)/$(notdir $@).jar
- @rm -f $(dir $@)/$(notdir $@).jar
-endef
-
-$(call get-class-path,dot/junit/DxUtil.class) $(call get-class-path,dot/junit/DxAbstractMain.class): $(HOST_OUT_JAVA_LIBRARIES)/cts-dalvik-buildutil.jar $(DX)
-
-$(GENERATED_FILES)/dot/junit/dexcore.jar: $(call get-class-path,dot/junit/DxUtil.class) $(call get-class-path,dot/junit/DxAbstractMain.class)
- $(call dex-classes,$(BUILD_UTIL_INTERMEDIATES_CLASSES),dot/junit/DxUtil.class dot/junit/DxAbstractMain.class)
-
diff --git a/tools/vm-tests/etc/starttests b/tools/vm-tests/etc/starttests
deleted file mode 100755
index 8d9633b..0000000
--- a/tools/vm-tests/etc/starttests
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set up prog to be the path of this script, including following symlinks,
-# and set up progdir to be the fully-qualified pathname of its directory.
-
-prog="$0"
-while [ -h "${prog}" ]; do
- newProg=`/bin/ls -ld "${prog}"`
- newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
- if expr "x${newProg}" : 'x/' >/dev/null; then
- prog="${newProg}"
- else
- progdir=`dirname "${prog}"`
- prog="${progdir}/${newProg}"
- fi
-done
-oldwd=`pwd`
-progdir=`dirname "${prog}"`
-cd "${progdir}"
-progdir=`pwd`
-prog="${progdir}"/`basename "${prog}"`
-cd "${oldwd}"
-
-libdir=`dirname $progdir`/framework
-
-javaOpts=""
-while expr "x$1" : 'x-J' >/dev/null; do
- opt=`expr "$1" : '-J\(.*\)'`
- javaOpts="${javaOpts} -${opt}"
- shift
-done
-
-
-#######################################################################
-# Original content of invocation script follows. Uses values cleverly
-# deduced by the above code.
-#######################################################################
-
-selection=$1
-interpreter="fast"
-if [ "$selection" = "--portable" ]; then
- selection=$2;
- interpreter="portable"
-fi
-
-dalviktest=$progdir/../cts_dalviktests
-dalviktestdir=$dalviktest/tests
-dexcore=$dalviktest/tests/dot/junit/dexcore.jar
-scriptdata=$dalviktest/data/scriptdata
-report=$dalviktest/report.html
-curdate=`date`
-curmode=""
-datadir=/tmp/${USER}
-base=$OUT
-framework=$base/system/framework
-export ANDROID_PRINTF_LOG=tag
-export ANDROID_LOG_TAGS='*:s' # was: jdwp:i dalvikvm:i dalvikvmi:i'
-export ANDROID_DATA=$datadir
-export ANDROID_ROOT=$base/system
-export LD_LIBRARY_PATH=$base/system/lib
-export DYLD_LIBRARY_PATH=$base/system/lib
-debug_opts="-Xcheck:jni -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
-exe=$base/system/bin/dalvikvm
-bpath=$framework/core.jar
-
-echo "--------------------------------------------------"
-echo "Dalvik VM Test Suite"
-echo "Version 1.0"
-echo "Copyright (c) 2008 The Android Open Source Project"
-echo ""
-
-if [ "$selection" = "--help" ]; then
- echo "Usage: vm-tests [--help|--portable] [<mnemonic>]"
- echo ""
- echo " --help prints this help message"
- echo " --portable uses the portable interpreter;"
- echo " default is the fast one"
- echo ""
- echo " <mnemonic> specifies the instruction to test;"
- echo " default is to run all tests"
- echo ""
- exit 1;
-fi
-
-rm -rf --preserve-root $datadir/dalvik-cache
-mkdir -p $datadir
-mkdir -p $datadir/dalvik-cache
-
-if [ "$TARGET_SIMULATOR" = "true" ]; then
- echo "Simulator mode, $interpreter interpreter";
- curmode="simulator"
- if [ -f $exe ]; then
- version=`${exe} -version 2> /dev/null | grep -o "version.*$"`
- echo "Using Dalvik VM ${version}"
- else
- echo "No Dalvik VM found at $exe";
- exit 1;
- fi
-else
- echo "Emulator mode, $interpreter interpreter";
- curmode="emulator"
- version=`adb shell dalvikvm -version 2> /dev/null | grep -o "version.*$"`
- if [ "${version}" != "" ]; then
- echo "Using Dalvik VM ${version}"
- else
- echo "No emulator or device found";
- exit 1;
- fi
-fi
-
-echo ""
-
-pre_report="<html><head><style>
-table tr.ok { background:#a0ffa0; }
-table tr.nok { background:#ffa0a0; }
-table tr.wok { background:#ffffa0; }
-table tr.lok { background:#aaaaff; }
-</style></head>
-<body>
-<h1>Dalvik VM test suite results</h1>
-Generated $curdate (using the $curmode)
-<p>
-<table width='100%'>
-<tr><td>Status</td><td>Target</td><td>Category</td><td>Details</td></tr>"
-post_report="</body></html>"
-
-rm -f $report
-echo $pre_report > $report
-
-# ----------- running each opcode test ------------
-
-export jpassedcnt=0
-export jfailedcnt=0
-export jvfefailedcnt=0
-export jwarningcnt=0
-export jallcnt=0
-export jcolumns=0
-
-# TODO unhack
-if [ "$TARGET_SIMULATOR" = "true" ]; then
- echo -n ""
-else
- adb push $dexcore /data/dexcore.jar >> /dev/null 2>&1
-fi
-
-function classnameToJar()
-{
- echo $1 | sed -e 's#\.#/#g;s#$#.jar#'
-}
-
-while read -u 3 myline;
-do
- # dot.junit.opcodes.add_double.Main_testB1;dot.junit.opcodes.add_double.d.T_add_double_1 ;opcode add_double;test B #1 (border edge case)
- # ->
- # mainclass: dot.junit.opcodes.add_double.Main_testB1
- # testcasedir: opcodes/add_double
- # testname: testB1 ->
- # dir dot/junit/opcodes/add_double/testB1
-
- # e.g dot.junit.opcodes.add_double.Main_testB1
- mainclass=`echo $myline | cut -d";" -f1`
- # e.g dot.junit.opcodes.add_double.d.T_add_double_1, space sep. >=1 entries
- deps=`echo $myline | cut -d";" -f2`
-
- jtitle=`echo $myline | cut -d";" -f3`
- jcomment=`echo $myline | cut -d";" -f4`
- details=`echo $myline | cut -d";" -f5`
-
- if [ "$selection" == "" ] || [ "$jtitle" == "$selection" ]; then
-
- (( jallcnt += 1 ))
-
- cd $dalviktestdir
- rm -f $datadir/dalvikout
- # write dalvik output to file
- echo -n "mk_b:" > $datadir/dalvikout
-
- if [ "$TARGET_SIMULATOR" = "true" ]; then
- classpath=`classnameToJar ${mainclass}`
- for dep in ${deps}; do
- depJar=`classnameToJar ${dep}`
- classpath=${classpath}:${depJar}
- done
- $valgrind $exe -Xint:$interpreter -Xmx512M -Xss32K -Xbootclasspath:$bpath $debug_opts \
- -classpath $dexcore:$classpath $mainclass >> $datadir/dalvikout 2>&1
-
- RESULTCODE=$?
- if [ ${RESULTCODE} -ne 0 ]; then
- echo "Dalvik VM failed, result=${RESULTCODE}" >> $datadir/dalvikout 2>&1
- fi
- else
- classpath="/data/dexcore.jar"
- deps=${deps}" "${mainclass}
- pushedjars=""
- for dep in ${deps}; do
- depJar=`classnameToJar ${dep}`
- depFileName=`basename ${depJar}`
- deviceFileName=/data/${depFileName}
- adb push ${depJar} ${deviceFileName} &> /dev/null
- classpath=${classpath}:${deviceFileName}
- pushedjars=${pushedjars}" "${deviceFileName}
- done
-
- adb shell dalvikvm -Xint:$interpreter -Xmx512M -Xss32K -Djava.io.tmpdir=/data/local/tmp \
- -classpath $classpath $mainclass >> $datadir/dalvikout 2>&1 && \
- echo -n dvmpassed: >> $datadir/dalvikout 2>&1
-
- for jar in ${pushedjars}; do
- adb shell rm ${jar} &> /dev/null
- done
- fi
-
- echo -n "mk_s:" >> $datadir/dalvikout
- # Verify tmpout only contains mkdxc_start;mkdxc_stop -> no system.out/err
- # because of exception. If ok -> green report line else red report with info
- # between mkdxc_start and stop
- vmresult=`cat $datadir/dalvikout`
-
- if [[ ("$vmresult" == "mk_b:mk_s:") || ("$vmresult" == "mk_b:dvmpassed:mk_s:") ]]; then
- (( jpassedcnt += 1 ))
- echo -n "<tr class=\"ok\"><td>Success</td><td>$jtitle</td>" >> $report
- echo "<td>$jcomment</td><td>$details</td></tr>" >> $report
- echo -n "."
- else
- vmres=`cat $datadir/dalvikout | sed -e 's/mk_b://;s/mk_s://'`
- vmres="$details<br><pre>$vmres</pre>"
-
- stacktraces=`echo $vmresult | grep "java\.lang\." | grep -c "at dot\.junit\."`
- if [[ $stacktraces > 0 ]]; then
- jtype=`echo "$mainclass" | sed -e 's/.*_test\([^0-9]*\)[0-9].*/\1/' `
- if [ "$jtype" == "VFE" ]; then
- (( jvfefailedcnt += 1 ))
- echo -n "V"
- else
- (( jfailedcnt += 1 ))
- echo -n "F"
- fi
-
- echo "<tr class=\"nok\"><td>Failure</td><td>$jtitle</td><td>" >> $report
- echo "$jcomment</td><td>$vmres</td></tr>" >> $report
- else
- (( jwarningcnt += 1 ))
- echo "<tr class=\"wok\"><td>Failure</td><td>$jtitle</td><td>" >> $report
- echo "$jcomment</td><td>(No stacktrace, but errors on console)" >> $report
- echo "<br>$vmres</td></tr>" >> $report
- echo -n "C"
- fi
- fi
-
- (( jcolumns += 1 ))
- if [ ${jcolumns} -eq 40 ]; then
- echo ""
- (( jcolumns = 0 ))
- fi
-
- fi
-# Use fd nr 3 to avoid subshelling via cat since this looses all
-# variables(and thus also the counters we are interested in).
-done 3<$scriptdata
-
-echo "</table>" >> $report
-let jallcalccnt=$jpassedcnt+$jfailedcnt+$jvfefailedcnt+$jwarningcnt
-if [ $jallcalccnt -ne $jallcnt ]; then
- echo "<br>error: green & red != total , $jallcalccnt -ne $jallcnt" >> $report
- exit 1;
-fi
-
-echo $post_report >> $report
-
-echo "<br>Tests run: ${jallcnt}" >> $report
-echo "<br>Functional failures: ${jfailedcnt}" >> $report
-echo "<br>Verifier failures: ${jvfefailedcnt}" >> $report
-echo "<br>Console errors: ${jwarningcnt}" >> $report
-
-echo $post_report >> $report
-
-if [[ jcolumns -ne 0 ]]; then
- echo ""
-fi
-
-echo ""
-
-if [[ jallcnt -eq jpassedcnt ]]; then
- echo "OK (${jpassedcnt} tests)"
-else
- echo "FAILURES!!!"
- echo ""
- echo "Tests run : ${jallcnt}"
- echo "Functional failures: ${jfailedcnt}"
- echo "Verifier failures : ${jvfefailedcnt}"
- echo "Console errors : ${jwarningcnt}"
-fi
-
-echo ""
-echo "Please see complete report in ${report}"
-echo "--------------------------------------------------"
diff --git a/tools/vm-tests/lib/junit.jar b/tools/vm-tests/lib/junit.jar
deleted file mode 100644
index 674d71e..0000000
--- a/tools/vm-tests/lib/junit.jar
+++ /dev/null
Binary files differ
diff --git a/tools/vm-tests/src/dot/Main.java b/tools/vm-tests/src/dot/Main.java
deleted file mode 100644
index 62e8e29..0000000
--- a/tools/vm-tests/src/dot/Main.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot;
-
-import dot.junit.AllTests;
-import junit.textui.TestRunner;
-
-/**
- * Main class to run the jasmin tests.
- */
-public class Main {
- public static void main(String[] args) {
- if (args.length == 0) {
- System.out.println("Running all tests...");
- TestRunner.run(AllTests.suite());
- } else {
- System.out.println("Running selected tests...");
- TestRunner.main(args);
- }
-
- Runtime.getRuntime().halt(0);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/AllTests.java b/tools/vm-tests/src/dot/junit/AllTests.java
deleted file mode 100644
index fd54824..0000000
--- a/tools/vm-tests/src/dot/junit/AllTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package dot.junit;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Listing of all the tests that are to be run.
- */
-public class AllTests {
- public static void run() {
- TestRunner.main(new String[] {AllTests.class.getName()});
- }
-
- public static final Test suite() {
- TestSuite suite = new TestSuite();
- // tests all opcodes
- suite.addTest(dot.junit.opcodes.AllTests.suite());
- suite.addTest(dot.junit.verify.AllTests.suite());
- suite.addTest(dot.junit.format.AllTests.suite());
- return suite;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/DxAbstractMain.java b/tools/vm-tests/src/dot/junit/DxAbstractMain.java
deleted file mode 100644
index d40fb94..0000000
--- a/tools/vm-tests/src/dot/junit/DxAbstractMain.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit;
-
-public class DxAbstractMain {
-
- static public void assertEquals(int expected, int actual) {
- if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals. Expected " + expected + " actual " + actual);
- }
-
- static public void assertEquals(String message, int expected, int actual) {
- if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals: " + message + " Expected " + expected + " actual " + actual);
- }
-
-
- static public void assertEquals(long expected, long actual) {
- if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals. Expected " + expected + " actual " + actual);
- }
-
- static public void assertEquals(double expected, double actual, double delta) {
- if(!(Math.abs(expected-actual) <= delta)) throw new RuntimeException("AssertionFailedError: not within delta");
- }
-
- static public void assertEquals(Object expected, Object actual) {
- if (expected == null && actual == null)
- return;
- if (expected != null && expected.equals(actual))
- return;
- throw new RuntimeException("AssertionFailedError: not the same");
- }
-
- static public void assertTrue(boolean condition) {
- if (!condition) throw new RuntimeException("AssertionFailedError: condition was false");
- }
-
- static public void assertFalse(boolean condition) {
- if (condition) throw new RuntimeException("AssertionFailedError: condition was true");
- }
-
- static public void assertNotNull(Object object) {
- if (object == null) throw new RuntimeException("AssertionFailedError: object was null");
- }
-
- static public void assertNull(Object object) {
- if (object != null) throw new RuntimeException("AssertionFailedError: object was not null");
- }
-
- static public void fail(String message) {
- throw new RuntimeException("AssertionFailedError msg:"+message);
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/DxTestCase.java b/tools/vm-tests/src/dot/junit/DxTestCase.java
deleted file mode 100644
index 00eb6fe..0000000
--- a/tools/vm-tests/src/dot/junit/DxTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit;
-
-import junit.framework.TestCase;
-
-public class DxTestCase extends TestCase {
-
- // omit the "extends TestCase" and uncomment the following methods if you would like to run the tests as rolled-out, separate tests.
-
-/*
- static public void assertEquals(int expected, int actual) {
- if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals");
- }
-
- static public void assertEquals(long expected, long actual) {
- if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals");
- }
-
- static public void assertEquals(double expected, double actual, double delta) {
- if(!(Math.abs(expected-actual) <= delta)) throw new RuntimeException("AssertionFailedError: not within delta");
- }
-
- static public void assertEquals(Object expected, Object actual) {
- if (expected == null && actual == null)
- return;
- if (expected != null && expected.equals(actual))
- return;
- throw new RuntimeException("AssertionFailedError: not the same");
- }
-
- static public void assertTrue(boolean condition) {
- if (!condition) throw new RuntimeException("AssertionFailedError: condition was false");
- }
-
- static public void assertFalse(boolean condition) {
- if (condition) throw new RuntimeException("AssertionFailedError: condition was true");
- }
-
- static public void assertNotNull(Object object) {
- if (object == null) throw new RuntimeException("AssertionFailedError: object was null");
- }
-
- static public void assertNull(Object object) {
- if (object != null) throw new RuntimeException("AssertionFailedError: object was not null");
- }
-
- static public void fail(String message) {
- throw new RuntimeException("AssertionFailedError msg:"+message);
- }
-*/
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/DxUtil.java b/tools/vm-tests/src/dot/junit/DxUtil.java
deleted file mode 100644
index cba0d54..0000000
--- a/tools/vm-tests/src/dot/junit/DxUtil.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit;
-
-public class DxUtil {
- private static boolean isDalvik = false;
-
- static {
- /**
- * whether in case of a failure, also ClassNotFoundException is accepted.
- * this makes sense for invalid classes that got rejected by the dx tools
- * and thus do not exist in .dex format, so that this class missing means a
- * the expected verify error (though at the dx tool level)
- */
-// String acnfS = System.getProperty("acceptCNF");
-// isDalvik = (acnfS != null && acnfS.equals("true"));
- //System.out.println("@DX:DxUtil:isDalik="+isDalvik);
- }
-
- public static void checkVerifyException(Throwable t) {
- // the dalvik vm and other vm handle verify errors differently (see the dalvik verifier)
- // the dalvik vm only throws a VerifyError, whereas other vm can throw all subclasses of
- // LinkageError:
- // - ClassCircularityError
- // - ClassFormatError
- // - ExceptionInInitializerError
- // - IncompatibleClassChangeError
- // - NoClassDefFoundError
- // - UnsatisfiedLinkError
- // - VerifyError
-
- // in case we are testing the dalvik, we also accept a ClassNotFoundException,
- // since that may happen when a verify error was thrown by the dx tool and thus no
- // classes.dex was written at all.
- //System.out.println("@dx:debug:isDalvik:"+isDalvik);
- /*
- if ((t instanceof VerifyError ||
- (isDalvik && t instanceof ClassNotFoundException) ||
- (!isDalvik && !(t instanceof NoClassDefFoundError)
- && t instanceof LinkageError))) {
- // ok, this is what we expected
- System.out.println("@dx:debug:vfe-ok: vfe was:"+t.getClass().getName()+", msg:"+t.getMessage());
- return;
- } else {
- throw new RuntimeException("test did not cause the expected verify error, but:"+t.getClass().getName()+", msg:"+t.getMessage());
- }
-*/
- if (t instanceof VerifyError || t instanceof java.lang.IncompatibleClassChangeError ||t instanceof ClassNotFoundException) {
- // ok, this is what we expected
- } else {
- throw new RuntimeException("VerifyError expected", t);
- }
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/format/AllTests.java b/tools/vm-tests/src/dot/junit/format/AllTests.java
deleted file mode 100644
index 30cc091..0000000
--- a/tools/vm-tests/src/dot/junit/format/AllTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.format;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Listing of all the tests that are to be run.
- */
-public class AllTests {
-
- public static void run() {
- TestRunner.main(new String[] {AllTests.class.getName()});
- }
-
- public static final Test suite() {
- TestSuite suite = new TestSuite("Tests for dalvik vm: test that "
- + "structurally damaged files are rejected by the verifier");
- suite.addTestSuite(dot.junit.format.f1.Test_f1.class);
-
- return suite;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/format/f1/Test_f1.java b/tools/vm-tests/src/dot/junit/format/f1/Test_f1.java
deleted file mode 100644
index 7751833..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/Test_f1.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.format.f1;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_f1 extends DxTestCase {
-
- /**
- * @constraint n/a
- * @title size of dex file shall be greater than size of header
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title check that .dex with wrong magic is rejected
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title check that .dex with wrong version is rejected
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title check that .dex with wrong endian_tag is rejected
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title check that .dex with wrong header size is rejected
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title file length must be equal to length in header
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title header->map_off != 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title number of classes in dex shall be > 0
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title check that .dex with wrong checksum is rejected
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_9");
- fail("expected a verification exception but this test may fail if this check is not enforced");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title check that .dex with wrong signature is rejected
- */
-// public void testVFE10() {
-// try {
-// Class.forName("dot.junit.format.f1.d.T_f1_10");
-// fail("expected a verification exception but this test may fail if this check is not enforced");
-// } catch (Throwable t) {
-// DxUtil.checkVerifyException(t);
-// }
-// }
-
- /**
- * @constraint n/a
- * @title header and map section mismatch
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title overlapping sections
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.format.f1.d.T_f1_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_0.java b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_0.java
deleted file mode 100644
index dda0585..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_0.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.format.f1.d;
-
-/**
-*
-*/
-public class T_f1_0 {
- // dummy
-}
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_1.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_1.d
deleted file mode 100644
index e674f34..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_1.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_1.java
-.class public dot.junit.format.f1.d.T_f1_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_1.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_1.dfh
deleted file mode 100644
index 9f57983..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_1.dfh
+++ /dev/null
@@ -1,50 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_1.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_1.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : ec6e3629
- 29 36 6E EC
-// parsed: offset 12, len 20: signature : 3861...369f
- 38 61 EF D2 97 82 DF F7 A7 77 7B 79 71 13 35 C5 6D 3E 36 9F
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_10.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_10.d
deleted file mode 100644
index c06a20e..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_10.java
-.class public dot.junit.format.f1.d.T_f1_10
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_10.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_10.dfh
deleted file mode 100644
index 302ade9..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_10.dfh
+++ /dev/null
@@ -1,250 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_10.dex'...
-//@leaveSignature
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 847035e6
- E6 35 70 84
-// parsed: offset 12, len 20: signature : 3812...2763
-//@mod 38 12 0A DA E3 92 55 8C 6E 8F 55 E2 13 CF 5C C2 93 C5 27 63
- 38 12 0A DA E3 92 55 8C 6E 8F 55 E2 13 CF 5C C2 93 C5 27 64
-// parsed: offset 32, len 4: file_size : 504
- F8 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 380 (0x00017c)
- 7C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 288
- 20 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_10;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 321 (0x000141) "Ljava/lang/Object;"
- 41 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 341 (0x000155) "T_f1_10.java"
- 55 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 355 (0x000163) "V"
- 63 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 358 (0x000166) "run"
- 66 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_10;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 363 (0x00016b)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 6B 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_10.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_10.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 33: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_10;"
- 1F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 31 30 3B 00
-// parsed: offset 321, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 341, len 14: TYPE_STRING_DATA_ITEM [3] "T_f1_10.java"
- 0C 54 5F 66 31 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 355, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 358, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_10;"
- // parsed: offset 363, len 1: static_fields_size: 0
- 00
- // parsed: offset 364, len 1: instance_fields_size: 0
- 00
- // parsed: offset 365, len 1: direct_methods_size: 1
- 01
- // parsed: offset 366, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 367, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 368, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 371, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 373, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 374, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 375, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 377, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 380, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 384, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 396, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 408, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 420, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 432, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 444, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 456, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 468, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 480, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 363 (0x00016b)
- 00 20 00 00 01 00 00 00 6B 01 00 00
- // parsed: offset 492, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 380 (0x00017c)
- 00 10 00 00 01 00 00 00 7C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_11.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_11.d
deleted file mode 100644
index 4ad888f..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_11.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_11.java
-.class public dot.junit.format.f1.d.T_f1_11
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_11.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_11.dfh
deleted file mode 100644
index 520eecd..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_11.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_11.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 759b34c5
- C5 34 9B 75
-// parsed: offset 12, len 20: signature : 4b4b...0a08
- 4B 4B CE BA CF CF BB 48 3B 6A 80 1B 8A C6 11 04 21 E0 0A 08
-// parsed: offset 32, len 4: file_size : 504
- F8 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 380 (0x00017c)
- 7C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
-//@mod B8 00 00 00
- BA 00 00 00
-// parsed: offset 104, len 4: data_size : 288
- 20 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_11;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 321 (0x000141) "Ljava/lang/Object;"
- 41 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 341 (0x000155) "T_f1_11.java"
- 55 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 355 (0x000163) "V"
- 63 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 358 (0x000166) "run"
- 66 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_11;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 363 (0x00016b)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 6B 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_11.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_11.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 33: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_11;"
- 1F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 31 31 3B 00
-// parsed: offset 321, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 341, len 14: TYPE_STRING_DATA_ITEM [3] "T_f1_11.java"
- 0C 54 5F 66 31 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 355, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 358, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_11;"
- // parsed: offset 363, len 1: static_fields_size: 0
- 00
- // parsed: offset 364, len 1: instance_fields_size: 0
- 00
- // parsed: offset 365, len 1: direct_methods_size: 1
- 01
- // parsed: offset 366, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 367, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 368, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 371, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 373, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 374, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 375, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 377, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 380, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 384, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 396, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 408, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 420, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 432, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 444, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 456, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 468, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 480, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 363 (0x00016b)
- 00 20 00 00 01 00 00 00 6B 01 00 00
- // parsed: offset 492, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 380 (0x00017c)
- 00 10 00 00 01 00 00 00 7C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_12.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_12.d
deleted file mode 100644
index e6e053d..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_12.java
-.class public dot.junit.format.f1.d.T_f1_12
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_12.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_12.dfh
deleted file mode 100644
index 4676340..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_12.dfh
+++ /dev/null
@@ -1,250 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_12.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_12.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 07303496
- 96 34 30 07
-// parsed: offset 12, len 20: signature : 100a...7239
- 10 0A 39 C5 D2 93 06 FC 06 5B 53 BC 09 9C 40 BB 95 77 72 39
-// parsed: offset 32, len 4: file_size : 504
- F8 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 380 (0x00017c)
- 7C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
-//@mod B8 00 00 00
- A8 00 00 00
-// parsed: offset 104, len 4: data_size : 288
- 20 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_12;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 321 (0x000141) "Ljava/lang/Object;"
- 41 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 341 (0x000155) "T_f1_12.java"
- 55 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 355 (0x000163) "V"
- 63 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 358 (0x000166) "run"
- 66 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_12;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_12;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_12.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 363 (0x00016b)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 6B 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_12.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_12.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 33: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_12;"
- 1F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 31 32 3B 00
-// parsed: offset 321, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 341, len 14: TYPE_STRING_DATA_ITEM [3] "T_f1_12.java"
- 0C 54 5F 66 31 5F 31 32 2E 6A 61 76 61 00
-// parsed: offset 355, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 358, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_12;"
- // parsed: offset 363, len 1: static_fields_size: 0
- 00
- // parsed: offset 364, len 1: instance_fields_size: 0
- 00
- // parsed: offset 365, len 1: direct_methods_size: 1
- 01
- // parsed: offset 366, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 367, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 368, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 371, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 373, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 374, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 375, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 377, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 380, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 384, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 396, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 408, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 420, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 432, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 444, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
-//@mod 06 00 00 00 01 00 00 00 B8 00 00 00
- 06 00 00 00 01 00 00 00 A8 00 00 00
- // parsed: offset 456, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 468, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 480, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 363 (0x00016b)
- 00 20 00 00 01 00 00 00 6B 01 00 00
- // parsed: offset 492, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 380 (0x00017c)
- 00 10 00 00 01 00 00 00 7C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_2.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_2.d
deleted file mode 100644
index 72ed9ac..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_2.java
-.class public dot.junit.format.f1.d.T_f1_2
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_2.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_2.dfh
deleted file mode 100644
index 8bb38ee..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_2.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_2.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_2.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
-//@mod 64 65 78 0A 30 33 35 00
- 64 66 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 8bce34e8
- E8 34 CE 8B
-// parsed: offset 12, len 20: signature : f886...8932
- F8 86 A3 17 14 FD 2D 49 29 6D D9 46 AA 4F 13 EF AE 3E 89 32
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_2;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_2.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_2;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_2;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_2.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_2.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_2.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_2;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 32 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_2.java"
- 0B 54 5F 66 31 5F 32 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_2;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_3.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_3.d
deleted file mode 100644
index f98d9fa..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_3.java
-.class public dot.junit.format.f1.d.T_f1_3
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_3.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_3.dfh
deleted file mode 100644
index cdfa4a8..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_3.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_3.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
-//@mod 64 65 78 0A 30 33 35 00
- 64 65 78 0A 30 33 36 00
-// parsed: offset 8, len 4: checksum : df0f35a3
- A3 35 0F DF
-// parsed: offset 12, len 20: signature : b564...1b93
- B5 64 17 3D FC 6E 3C 3F 82 57 DF 8D 9C A7 73 4C A9 DF 1B 93
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_3;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_3.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_3;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_3.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_3.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_3;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 33 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_3.java"
- 0B 54 5F 66 31 5F 33 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_3;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_4.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_4.d
deleted file mode 100644
index 22611e3..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_4.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_4.java
-.class public dot.junit.format.f1.d.T_f1_4
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_4.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_4.dfh
deleted file mode 100644
index ea0b607..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_4.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_4.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 64f33679
- 79 36 F3 64
-// parsed: offset 12, len 20: signature : 8406...c8ea
- 84 06 E5 69 3D 66 48 AB 94 79 27 C2 C1 ED 00 D7 F5 13 C8 EA
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
-//@mod 78 56 34 12
- 78 56 12 34
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_4;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_4.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_4;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_4.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_4.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_4;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 34 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_4.java"
- 0B 54 5F 66 31 5F 34 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_4;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_5.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_5.d
deleted file mode 100644
index e3a993f..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_5.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_5.java
-.class public dot.junit.format.f1.d.T_f1_5
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_5.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_5.dfh
deleted file mode 100644
index 99ffd13..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_5.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_5.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_5.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 76133706
- 06 37 13 76
-// parsed: offset 12, len 20: signature : 8bbd...7aa2
- 8B BD 3B 72 62 F4 A2 15 DF 5E D8 E5 D2 AE 88 0D 4F B2 7A A2
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
-//@mod 70 00 00 00
- 69 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_5;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_5.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_5;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_5;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_5.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_5.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_5.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_5;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 35 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_5.java"
- 0B 54 5F 66 31 5F 35 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_5;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_6.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_6.d
deleted file mode 100644
index 6bb0bf0..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_6.java
-.class public dot.junit.format.f1.d.T_f1_6
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_6.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_6.dfh
deleted file mode 100644
index 375a9ac..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_6.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_6.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_6.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 9bbb37a1
- A1 37 BB 9B
-// parsed: offset 12, len 20: signature : a799...4c32
- A7 99 F8 99 E8 8A 81 65 99 13 A3 2A E4 F9 F2 75 BD A6 4C 32
-// parsed: offset 32, len 4: file_size : 500
-//@mod F4 01 00 00
- F4 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_6;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_6.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_6;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_6;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_6.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_6.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_6.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_6;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 36 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_6.java"
- 0B 54 5F 66 31 5F 36 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_6;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_7.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_7.d
deleted file mode 100644
index 61f31b1..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_7.java
-.class public dot.junit.format.f1.d.T_f1_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_7.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_7.dfh
deleted file mode 100644
index 1845c7a..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_7.dfh
+++ /dev/null
@@ -1,249 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_7.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_7.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 6b8435f0
- F0 35 84 6B
-// parsed: offset 12, len 20: signature : a4f8...a536
- A4 F8 18 65 4B 3E B6 D4 7A 69 71 CE B6 43 71 42 D3 6C A5 36
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
-//@mod 78 01 00 00
- 00 00 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_7;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_7.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_7;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_7;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_7.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_7.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_7.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_7;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 37 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_7.java"
- 0B 54 5F 66 31 5F 37 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_7;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_8.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_8.d
deleted file mode 100644
index c622eb0..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_8.java
-.class public dot.junit.format.f1.d.T_f1_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_8.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_8.dfh
deleted file mode 100644
index 3ebff78..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_8.dfh
+++ /dev/null
@@ -1,251 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_8.dex'...
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : bd8b37bf
- BF 37 8B BD
-// parsed: offset 12, len 20: signature : 1091...62b1
- 10 91 A3 C7 70 2E 36 E5 FD 30 D9 9A 80 EE 8A CC EC BA 62 B1
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
-//@mod 01 00 00 00
- 00 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_8;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_8.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_8;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
-//@mod 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
- 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_8.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_8.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_8;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 38 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_8.java"
- 0B 54 5F 66 31 5F 38 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_8;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
-//@mod 06 00 00 00 01 00 00 00 B8 00 00 00
- 06 00 00 00 00 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_9.d b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_9.d
deleted file mode 100644
index 9a44f4e..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f1_9.java
-.class public dot.junit.format.f1.d.T_f1_9
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- nop
- nop
- nop
- nop
- const v2, 456
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_9.dfh b/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_9.dfh
deleted file mode 100644
index f3e4dd1..0000000
--- a/tools/vm-tests/src/dot/junit/format/f1/d/T_f1_9.dfh
+++ /dev/null
@@ -1,250 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/format/f1/d/T_f1_9.dex'...
-//@leaveChecksum
-// Opened 'out/classes_dasm/dot/junit/format/f1/d/T_f1_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a9763611
-//@mod 11 36 76 A9
- 11 36 76 AA
-// parsed: offset 12, len 20: signature : 1ee9...1036
- 1E E9 E9 EC 3D 14 5F 07 A1 FA 8E E8 B1 FA 6C 91 35 6A 10 36
-// parsed: offset 32, len 4: file_size : 500
- F4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 376 (0x000178)
- 78 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 284
- 1C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 280 (0x000118) "<init>"
- 18 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 288 (0x000120) "Ldot/junit/format/f1/d/T_f1_9;"
- 20 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 320 (0x000140) "Ljava/lang/Object;"
- 40 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 340 (0x000154) "T_f1_9.java"
- 54 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 353 (0x000161) "V"
- 61 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 356 (0x000164) "run"
- 64 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/format/f1/d/T_f1_9;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/format/f1/d/T_f1_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_f1_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 361 (0x000169)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 69 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_9.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.format.f1.d.T_f1_9.run"
- // parsed: offset 240, len 2: registers_size: 3
- 03 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: const v0, #float 0.000000 // #0x0000007b int
- 14 00 7B 00 00 00
- // parsed: offset 262, len 2: |0003: nop // spacer
- 00 00
- // parsed: offset 264, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 266, len 2: |0005: nop // spacer
- 00 00
- // parsed: offset 268, len 2: |0006: nop // spacer
- 00 00
- // parsed: offset 270, len 6: |0007: const v2, #float 0.000000 // #0x000001c8 int
- 14 02 C8 01 00 00
- // parsed: offset 276, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 278, len 2: PADDING
- 00 00
-// parsed: offset 280, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 288, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/format/f1/d/T_f1_9;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 66 6F 72 6D 61 74 2F 66 31 2F 64 2F 54 5F 66 31 5F 39 3B 00
-// parsed: offset 320, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 340, len 13: TYPE_STRING_DATA_ITEM [3] "T_f1_9.java"
- 0B 54 5F 66 31 5F 39 2E 6A 61 76 61 00
-// parsed: offset 353, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 356, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/format/f1/d/T_f1_9;"
- // parsed: offset 361, len 1: static_fields_size: 0
- 00
- // parsed: offset 362, len 1: instance_fields_size: 0
- 00
- // parsed: offset 363, len 1: direct_methods_size: 1
- 01
- // parsed: offset 364, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 365, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 366, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 369, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 371, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 372, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 373, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 375, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 376, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 380, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 392, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 404, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 416, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 428, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 440, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 452, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 464, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 280 (0x000118)
- 02 20 00 00 06 00 00 00 18 01 00 00
- // parsed: offset 476, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 361 (0x000169)
- 00 20 00 00 01 00 00 00 69 01 00 00
- // parsed: offset 488, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 376 (0x000178)
- 00 10 00 00 01 00 00 00 78 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/AllTests.java b/tools/vm-tests/src/dot/junit/opcodes/AllTests.java
deleted file mode 100644
index 282ac42..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/AllTests.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Listing of all the tests that are to be run.
- */
-public class AllTests {
-
- public static void run() {
- TestRunner.main(new String[] {AllTests.class.getName()});
- }
-
- public static final Test suite() {
- TestSuite suite = new TestSuite("Tests for all dalvik vm opcodes");
- suite.addTestSuite(dot.junit.opcodes.add_double_2addr.Test_add_double_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.add_double.Test_add_double.class);
- suite.addTestSuite(dot.junit.opcodes.add_float_2addr.Test_add_float_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.add_float.Test_add_float.class);
- suite.addTestSuite(dot.junit.opcodes.add_int_2addr.Test_add_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.add_int_lit16.Test_add_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.add_int_lit8.Test_add_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.add_int.Test_add_int.class);
- suite.addTestSuite(dot.junit.opcodes.add_long_2addr.Test_add_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.add_long.Test_add_long.class);
- suite.addTestSuite(dot.junit.opcodes.aget_boolean.Test_aget_boolean.class);
- suite.addTestSuite(dot.junit.opcodes.aget_byte.Test_aget_byte.class);
- suite.addTestSuite(dot.junit.opcodes.aget_char.Test_aget_char.class);
- suite.addTestSuite(dot.junit.opcodes.aget_object.Test_aget_object.class);
- suite.addTestSuite(dot.junit.opcodes.aget_short.Test_aget_short.class);
- suite.addTestSuite(dot.junit.opcodes.aget.Test_aget.class);
- suite.addTestSuite(dot.junit.opcodes.aget_wide.Test_aget_wide.class);
- suite.addTestSuite(dot.junit.opcodes.and_int_2addr.Test_and_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.and_int_lit16.Test_and_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.and_int_lit8.Test_and_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.and_int.Test_and_int.class);
- suite.addTestSuite(dot.junit.opcodes.and_long_2addr.Test_and_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.and_long.Test_and_long.class);
- suite.addTestSuite(dot.junit.opcodes.aput_boolean.Test_aput_boolean.class);
- suite.addTestSuite(dot.junit.opcodes.aput_byte.Test_aput_byte.class);
- suite.addTestSuite(dot.junit.opcodes.aput_char.Test_aput_char.class);
- suite.addTestSuite(dot.junit.opcodes.aput_object.Test_aput_object.class);
- suite.addTestSuite(dot.junit.opcodes.aput_short.Test_aput_short.class);
- suite.addTestSuite(dot.junit.opcodes.aput.Test_aput.class);
- suite.addTestSuite(dot.junit.opcodes.aput_wide.Test_aput_wide.class);
- suite.addTestSuite(dot.junit.opcodes.array_length.Test_array_length.class);
- suite.addTestSuite(dot.junit.opcodes.check_cast.Test_check_cast.class);
- suite.addTestSuite(dot.junit.opcodes.cmpg_double.Test_cmpg_double.class);
- suite.addTestSuite(dot.junit.opcodes.cmpg_float.Test_cmpg_float.class);
- suite.addTestSuite(dot.junit.opcodes.cmpl_double.Test_cmpl_double.class);
- suite.addTestSuite(dot.junit.opcodes.cmpl_float.Test_cmpl_float.class);
- suite.addTestSuite(dot.junit.opcodes.cmp_long.Test_cmp_long.class);
- suite.addTestSuite(dot.junit.opcodes.const_16.Test_const_16.class);
- suite.addTestSuite(dot.junit.opcodes.const_4.Test_const_4.class);
- suite.addTestSuite(dot.junit.opcodes.const_class.Test_const_class.class);
- suite.addTestSuite(dot.junit.opcodes.const_high16.Test_const_high16.class);
- suite.addTestSuite(dot.junit.opcodes.const_string_jumbo.Test_const_string_jumbo.class);
- suite.addTestSuite(dot.junit.opcodes.const_string.Test_const_string.class);
- suite.addTestSuite(dot.junit.opcodes.const_wide_16.Test_const_wide_16.class);
- suite.addTestSuite(dot.junit.opcodes.const_wide_32.Test_const_wide_32.class);
- suite.addTestSuite(dot.junit.opcodes.const_wide_high16.Test_const_wide_high16.class);
- suite.addTestSuite(dot.junit.opcodes.const_wide.Test_const_wide.class);
- suite.addTestSuite(dot.junit.opcodes.div_double_2addr.Test_div_double_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.div_double.Test_div_double.class);
- suite.addTestSuite(dot.junit.opcodes.div_float_2addr.Test_div_float_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.div_float.Test_div_float.class);
- suite.addTestSuite(dot.junit.opcodes.div_int_2addr.Test_div_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.div_int_lit16.Test_div_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.div_int_lit8.Test_div_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.div_int.Test_div_int.class);
- suite.addTestSuite(dot.junit.opcodes.div_long_2addr.Test_div_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.div_long.Test_div_long.class);
- suite.addTestSuite(dot.junit.opcodes.double_to_float.Test_double_to_float.class);
- suite.addTestSuite(dot.junit.opcodes.double_to_int.Test_double_to_int.class);
- suite.addTestSuite(dot.junit.opcodes.double_to_long.Test_double_to_long.class);
- suite.addTestSuite(dot.junit.opcodes.fill_array_data.Test_fill_array_data.class);
- suite.addTestSuite(dot.junit.opcodes.filled_new_array_range.Test_filled_new_array_range.class);
- suite.addTestSuite(dot.junit.opcodes.filled_new_array.Test_filled_new_array.class);
- suite.addTestSuite(dot.junit.opcodes.float_to_double.Test_float_to_double.class);
- suite.addTestSuite(dot.junit.opcodes.float_to_int.Test_float_to_int.class);
- suite.addTestSuite(dot.junit.opcodes.float_to_long.Test_float_to_long.class);
- suite.addTestSuite(dot.junit.opcodes.goto_16.Test_goto_16.class);
- suite.addTestSuite(dot.junit.opcodes.goto_32.Test_goto_32.class);
- suite.addTestSuite(dot.junit.opcodes.if_eq.Test_if_eq.class);
- suite.addTestSuite(dot.junit.opcodes.if_eqz.Test_if_eqz.class);
- suite.addTestSuite(dot.junit.opcodes.if_ge.Test_if_ge.class);
- suite.addTestSuite(dot.junit.opcodes.if_gez.Test_if_gez.class);
- suite.addTestSuite(dot.junit.opcodes.if_gt.Test_if_gt.class);
- suite.addTestSuite(dot.junit.opcodes.if_gtz.Test_if_gtz.class);
- suite.addTestSuite(dot.junit.opcodes.if_le.Test_if_le.class);
- suite.addTestSuite(dot.junit.opcodes.if_lez.Test_if_lez.class);
- suite.addTestSuite(dot.junit.opcodes.if_lt.Test_if_lt.class);
- suite.addTestSuite(dot.junit.opcodes.if_ltz.Test_if_ltz.class);
- suite.addTestSuite(dot.junit.opcodes.if_ne.Test_if_ne.class);
- suite.addTestSuite(dot.junit.opcodes.if_nez.Test_if_nez.class);
- suite.addTestSuite(dot.junit.opcodes.iget_boolean.Test_iget_boolean.class);
- suite.addTestSuite(dot.junit.opcodes.iget_byte.Test_iget_byte.class);
- suite.addTestSuite(dot.junit.opcodes.iget_char.Test_iget_char.class);
- suite.addTestSuite(dot.junit.opcodes.iget_object.Test_iget_object.class);
- suite.addTestSuite(dot.junit.opcodes.iget_short.Test_iget_short.class);
- suite.addTestSuite(dot.junit.opcodes.iget.Test_iget.class);
- suite.addTestSuite(dot.junit.opcodes.iget_wide.Test_iget_wide.class);
- suite.addTestSuite(dot.junit.opcodes.instance_of.Test_instance_of.class);
- suite.addTestSuite(dot.junit.opcodes.int_to_byte.Test_int_to_byte.class);
- suite.addTestSuite(dot.junit.opcodes.int_to_char.Test_int_to_char.class);
- suite.addTestSuite(dot.junit.opcodes.int_to_double.Test_int_to_double.class);
- suite.addTestSuite(dot.junit.opcodes.int_to_float.Test_int_to_float.class);
- suite.addTestSuite(dot.junit.opcodes.int_to_long.Test_int_to_long.class);
- suite.addTestSuite(dot.junit.opcodes.int_to_short.Test_int_to_short.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_direct_range.Test_invoke_direct_range.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_direct.Test_invoke_direct.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_interface_range.Test_invoke_interface_range.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_interface.Test_invoke_interface.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_static_range.Test_invoke_static_range.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_static.Test_invoke_static.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_super_range.Test_invoke_super_range.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_super.Test_invoke_super.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_virtual_range.Test_invoke_virtual_range.class);
- suite.addTestSuite(dot.junit.opcodes.invoke_virtual.Test_invoke_virtual.class);
- suite.addTestSuite(dot.junit.opcodes.iput_boolean.Test_iput_boolean.class);
- suite.addTestSuite(dot.junit.opcodes.iput_byte.Test_iput_byte.class);
- suite.addTestSuite(dot.junit.opcodes.iput_char.Test_iput_char.class);
- suite.addTestSuite(dot.junit.opcodes.iput_object.Test_iput_object.class);
- suite.addTestSuite(dot.junit.opcodes.iput_short.Test_iput_short.class);
- suite.addTestSuite(dot.junit.opcodes.iput.Test_iput.class);
- suite.addTestSuite(dot.junit.opcodes.iput_wide.Test_iput_wide.class);
- suite.addTestSuite(dot.junit.opcodes.long_to_double.Test_long_to_double.class);
- suite.addTestSuite(dot.junit.opcodes.long_to_float.Test_long_to_float.class);
- suite.addTestSuite(dot.junit.opcodes.long_to_int.Test_long_to_int.class);
- suite.addTestSuite(dot.junit.opcodes.monitor_enter.Test_monitor_enter.class);
- suite.addTestSuite(dot.junit.opcodes.monitor_exit.Test_monitor_exit.class);
- suite.addTestSuite(dot.junit.opcodes.move_16.Test_move_16.class);
- suite.addTestSuite(dot.junit.opcodes.move_exception.Test_move_exception.class);
- suite.addTestSuite(dot.junit.opcodes.move_from16.Test_move_from16.class);
- suite.addTestSuite(dot.junit.opcodes.move_object_16.Test_move_object_16.class);
- suite.addTestSuite(dot.junit.opcodes.move_object_from16.Test_move_object_from16.class);
- suite.addTestSuite(dot.junit.opcodes.move_object.Test_move_object.class);
- suite.addTestSuite(dot.junit.opcodes.move_result_object.Test_move_result_object.class);
- suite.addTestSuite(dot.junit.opcodes.move_result.Test_move_result.class);
- suite.addTestSuite(dot.junit.opcodes.move_result_wide.Test_move_result_wide.class);
- suite.addTestSuite(dot.junit.opcodes.move.Test_move.class);
- suite.addTestSuite(dot.junit.opcodes.move_wide_16.Test_move_wide_16.class);
- suite.addTestSuite(dot.junit.opcodes.move_wide_from16.Test_move_wide_from16.class);
- suite.addTestSuite(dot.junit.opcodes.move_wide.Test_move_wide.class);
- suite.addTestSuite(dot.junit.opcodes.mul_double_2addr.Test_mul_double_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.mul_double.Test_mul_double.class);
- suite.addTestSuite(dot.junit.opcodes.mul_float_2addr.Test_mul_float_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.mul_float.Test_mul_float.class);
- suite.addTestSuite(dot.junit.opcodes.mul_int_2addr.Test_mul_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.mul_int_lit16.Test_mul_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.mul_int_lit8.Test_mul_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.mul_int.Test_mul_int.class);
- suite.addTestSuite(dot.junit.opcodes.mul_long_2addr.Test_mul_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.mul_long.Test_mul_long.class);
- suite.addTestSuite(dot.junit.opcodes.neg_double.Test_neg_double.class);
- suite.addTestSuite(dot.junit.opcodes.neg_float.Test_neg_float.class);
- suite.addTestSuite(dot.junit.opcodes.neg_int.Test_neg_int.class);
- suite.addTestSuite(dot.junit.opcodes.neg_long.Test_neg_long.class);
- suite.addTestSuite(dot.junit.opcodes.new_array.Test_new_array.class);
- suite.addTestSuite(dot.junit.opcodes.new_instance.Test_new_instance.class);
- suite.addTestSuite(dot.junit.opcodes.nop.Test_nop.class);
- suite.addTestSuite(dot.junit.opcodes.not_int.Test_not_int.class);
- suite.addTestSuite(dot.junit.opcodes.not_long.Test_not_long.class);
- suite.addTestSuite(dot.junit.opcodes.opc_const.Test_opc_const.class);
- suite.addTestSuite(dot.junit.opcodes.opc_goto.Test_opc_goto.class);
- suite.addTestSuite(dot.junit.opcodes.opc_return.Test_opc_return.class);
- suite.addTestSuite(dot.junit.opcodes.opc_throw.Test_opc_throw.class);
- suite.addTestSuite(dot.junit.opcodes.or_int_2addr.Test_or_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.or_int_lit16.Test_or_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.or_int_lit8.Test_or_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.or_int.Test_or_int.class);
- suite.addTestSuite(dot.junit.opcodes.or_long_2addr.Test_or_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.or_long.Test_or_long.class);
- suite.addTestSuite(dot.junit.opcodes.packed_switch.Test_packed_switch.class);
- suite.addTestSuite(dot.junit.opcodes.rem_double_2addr.Test_rem_double_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.rem_double.Test_rem_double.class);
- suite.addTestSuite(dot.junit.opcodes.rem_float_2addr.Test_rem_float_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.rem_float.Test_rem_float.class);
- suite.addTestSuite(dot.junit.opcodes.rem_int_2addr.Test_rem_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.rem_int_lit16.Test_rem_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.rem_int_lit8.Test_rem_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.rem_int.Test_rem_int.class);
- suite.addTestSuite(dot.junit.opcodes.rem_long_2addr.Test_rem_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.rem_long.Test_rem_long.class);
- suite.addTestSuite(dot.junit.opcodes.return_object.Test_return_object.class);
- suite.addTestSuite(dot.junit.opcodes.return_void.Test_return_void.class);
- suite.addTestSuite(dot.junit.opcodes.return_wide.Test_return_wide.class);
- suite.addTestSuite(dot.junit.opcodes.rsub_int_lit8.Test_rsub_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.rsub_int.Test_rsub_int.class);
- suite.addTestSuite(dot.junit.opcodes.sget_boolean.Test_sget_boolean.class);
- suite.addTestSuite(dot.junit.opcodes.sget_byte.Test_sget_byte.class);
- suite.addTestSuite(dot.junit.opcodes.sget_char.Test_sget_char.class);
- suite.addTestSuite(dot.junit.opcodes.sget_object.Test_sget_object.class);
- suite.addTestSuite(dot.junit.opcodes.sget_short.Test_sget_short.class);
- suite.addTestSuite(dot.junit.opcodes.sget.Test_sget.class);
- suite.addTestSuite(dot.junit.opcodes.sget_wide.Test_sget_wide.class);
- suite.addTestSuite(dot.junit.opcodes.shl_int_2addr.Test_shl_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.shl_int_lit8.Test_shl_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.shl_int.Test_shl_int.class);
- suite.addTestSuite(dot.junit.opcodes.shl_long_2addr.Test_shl_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.shl_long.Test_shl_long.class);
- suite.addTestSuite(dot.junit.opcodes.shr_int_2addr.Test_shr_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.shr_int_lit8.Test_shr_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.shr_int.Test_shr_int.class);
- suite.addTestSuite(dot.junit.opcodes.shr_long_2addr.Test_shr_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.shr_long.Test_shr_long.class);
- suite.addTestSuite(dot.junit.opcodes.sparse_switch.Test_sparse_switch.class);
- suite.addTestSuite(dot.junit.opcodes.sput_boolean.Test_sput_boolean.class);
- suite.addTestSuite(dot.junit.opcodes.sput_byte.Test_sput_byte.class);
- suite.addTestSuite(dot.junit.opcodes.sput_char.Test_sput_char.class);
- suite.addTestSuite(dot.junit.opcodes.sput_object.Test_sput_object.class);
- suite.addTestSuite(dot.junit.opcodes.sput_short.Test_sput_short.class);
- suite.addTestSuite(dot.junit.opcodes.sput.Test_sput.class);
- suite.addTestSuite(dot.junit.opcodes.sput_wide.Test_sput_wide.class);
- suite.addTestSuite(dot.junit.opcodes.sub_double_2addr.Test_sub_double_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.sub_double.Test_sub_double.class);
- suite.addTestSuite(dot.junit.opcodes.sub_float_2addr.Test_sub_float_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.sub_float.Test_sub_float.class);
- suite.addTestSuite(dot.junit.opcodes.sub_int_2addr.Test_sub_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.sub_int.Test_sub_int.class);
- suite.addTestSuite(dot.junit.opcodes.sub_long_2addr.Test_sub_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.sub_long.Test_sub_long.class);
- suite.addTestSuite(dot.junit.opcodes.ushr_int_2addr.Test_ushr_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.ushr_int_lit8.Test_ushr_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.ushr_int.Test_ushr_int.class);
- suite.addTestSuite(dot.junit.opcodes.ushr_long_2addr.Test_ushr_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.ushr_long.Test_ushr_long.class);
- suite.addTestSuite(dot.junit.opcodes.xor_int_2addr.Test_xor_int_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.xor_int_lit16.Test_xor_int_lit16.class);
- suite.addTestSuite(dot.junit.opcodes.xor_int_lit8.Test_xor_int_lit8.class);
- suite.addTestSuite(dot.junit.opcodes.xor_int.Test_xor_int.class);
- suite.addTestSuite(dot.junit.opcodes.xor_long_2addr.Test_xor_long_2addr.class);
- suite.addTestSuite(dot.junit.opcodes.xor_long.Test_xor_long.class);
- return suite;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/Test_add_double.java b/tools/vm-tests/src/dot/junit/opcodes/add_double/Test_add_double.java
deleted file mode 100644
index 8887d50..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/Test_add_double.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_double.d.T_add_double_1;
-import dot.junit.opcodes.add_double.d.T_add_double_3;
-
-public class Test_add_double extends DxTestCase {
-
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(5.84d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Arguments = 0, -3.14d
- */
- public void testN2() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(-3.14d, t.run(0, -3.14d));
- }
-
- /**
- * @title Arguments = -3.14d, -2.7d
- */
- public void testN3() {
- //@uses dot.junit.opcodes.add_double.d.T_add_double_2
- //@uses dot.junit.opcodes.add_double.d.T_add_double_3
- T_add_double_1 t = new T_add_double_1();
- assertEquals(-5.84d, t.run(-3.14d, -2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this sum of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_add_double_3 t = new T_add_double_3();
- try {
- t.run();
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.POSITIVE_INFINITY
- */
- public void testB3() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB4() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = +0, -0
- */
- public void testB5() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(+0d, t.run(+0d, -0d));
- }
-
- /**
- * @title Arguments = -0d, -0d
- */
- public void testB6() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(-0d, t.run(-0d, -0d));
- }
-
- /**
- * @title Arguments = -2.7d, 2.7d
- */
- public void testB7() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(+0d, t.run(-2.7d, 2.7d));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.MAX_VALUE
- */
- public void testB8() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.MAX_VALUE,
- Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.MIN_VALUE, -4.9E-324
- */
- public void testB9() {
- T_add_double_1 t = new T_add_double_1();
- assertEquals(0d, t.run(Double.MIN_VALUE, -4.9E-324));
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_1.d
deleted file mode 100644
index f3d3653..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_1.java
-.class public dot.junit.opcodes.add_double.d.T_add_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- add-double v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_1.java
deleted file mode 100644
index 530fbd2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_double.d;
-
-public class T_add_double_1 {
-
- public double run(double a, double b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_2.d
deleted file mode 100644
index da30626..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2.java
-.class public dot.junit.opcodes.add_double.d.T_add_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- const v3, 3.1415
- add-double v0, v3, v5
- return-wide v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_3.d
deleted file mode 100644
index ebdc492..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_3.java
-.class public dot.junit.opcodes.add_double.d.T_add_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()D
-.limit regs 7
-
- const-wide v2, 31415
- const-wide v4, 3.1415
- add-double v0, v2, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_3.java b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_3.java
deleted file mode 100644
index fadc09e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_double.d;
-
-public class T_add_double_3 {
-
- public double run() {
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_4.d
deleted file mode 100644
index 7acfdfd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_4.java
-.class public dot.junit.opcodes.add_double.d.T_add_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- add-double v0, v3, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_5.d
deleted file mode 100644
index 64b8613..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_5.java
-.class public dot.junit.opcodes.add_double.d.T_add_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- add-double v0, v3, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_6.d
deleted file mode 100644
index 424bd3f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double/d/T_add_double_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_6.java
-.class public dot.junit.opcodes.add_double.d.T_add_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 7
- move v0, v5
- move v1, v5
- move v2, v6
- move v3, v6
- add-double v0, v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java
deleted file mode 100644
index f0a17a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_double_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_1;
-import dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_3;
-
-public class Test_add_double_2addr extends DxTestCase {
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(5.84d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Arguments = 0, -3.14d
- */
- public void testN2() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(-3.14d, t.run(0, -3.14d));
- }
-
- /**
- * @title Arguments = -3.14d, -2.7d
- */
- public void testN3() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(-5.84d, t.run(-3.14d, -2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this sum of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_add_double_2addr_3 t = new T_add_double_2addr_3();
- try {
- t.run();
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.POSITIVE_INFINITY
- */
- public void testB3() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB4() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = +0, -0
- */
- public void testB5() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(+0d, t.run(+0d, -0d));
- }
-
- /**
- * @title Arguments = -0d, -0d
- */
- public void testB6() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(-0d, t.run(-0d, -0d));
- }
-
- /**
- * @title Arguments = -2.7d, 2.7d
- */
- public void testB7() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(+0d, t.run(-2.7d, 2.7d));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.MAX_VALUE
- */
- public void testB8() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.MAX_VALUE,
- Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.MIN_VALUE, -4.9E-324
- */
- public void testB9() {
- T_add_double_2addr_1 t = new T_add_double_2addr_1();
- assertEquals(0d, t.run(Double.MIN_VALUE, -4.9E-324));
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.d
deleted file mode 100644
index 44d1f78..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2addr_1.java
-.class public dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- add-double/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.java
deleted file mode 100644
index 33ac19a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_double_2addr.d;
-
-public class T_add_double_2addr_1 {
-
- public double run(double a, double b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_2.d
deleted file mode 100644
index 3633e01..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2addr_2.java
-.class public dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- const v3, 3.1415
- add-double/2addr v3, v5
- return-wide v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.d
deleted file mode 100644
index 62f4198..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2addr_3.java
-.class public dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()D
-.limit regs 7
-
- const-wide v2, 31415
- const-wide v4, 3.1415
- add-double/2addr v4, v2
- return-wide v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.java b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.java
deleted file mode 100644
index 860bfc9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_double_2addr.d;
-
-public class T_add_double_2addr_3 {
-
- public double run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4.d
deleted file mode 100644
index a9f2625..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2addr_4.java
-.class public dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- add-double/2addr v3, v2
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5.d
deleted file mode 100644
index 521f02b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2addr_5.java
-.class public dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- add-double/2addr v3, v7
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6.d
deleted file mode 100644
index cd95033..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_double_2addr_6.java
-.class public dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 7
- move v0, v5
- move v1, v5
- move v2, v6
- move v3, v6
- add-double/2addr v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/Test_add_float.java b/tools/vm-tests/src/dot/junit/opcodes/add_float/Test_add_float.java
deleted file mode 100644
index b821daa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/Test_add_float.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_float.d.T_add_float_1;
-import dot.junit.opcodes.add_float.d.T_add_float_5;
-
-public class Test_add_float extends DxTestCase {
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(5.84f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Arguments = 0, -3.14f
- */
- public void testN2() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(-3.14f, t.run(0, -3.14f));
- }
-
- /**
- * @title Arguments = -3.14f, -2.7f
- */
- public void testN3() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(-5.84f, t.run(-3.14f, -2.7f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this sum of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_add_float_5 t = new T_add_float_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(3.3028235E38f, 0.11E38f));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_add_float_1 t = new T_add_float_1();
- assertTrue(Float.isNaN(t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY)));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.POSITIVE_INFINITY
- */
- public void testB3() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB4() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = +0, -0f
- */
- public void testB5() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(+0f, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = -0f, -0f
- */
- public void testB6() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(-0f, t.run(-0f, -0f));
- }
-
- /**
- * @title Arguments = -2.7f, 2.7f
- */
- public void testB7() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(+0f, t.run(-2.7f, 2.7f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.MAX_VALUE
- */
- public void testB8() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
- Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE, -1.4E-45f
- */
- public void testB9() {
- T_add_float_1 t = new T_add_float_1();
- assertEquals(0f, t.run(Float.MIN_VALUE, -1.4E-45f));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_1.d
deleted file mode 100644
index 502b435..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_1.java
-.class public dot.junit.opcodes.add_float.d.T_add_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- add-float v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_1.java
deleted file mode 100644
index efe39a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_float.d;
-
-public class T_add_float_1 {
-
- public float run(float a, float b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_2.d
deleted file mode 100644
index 627036b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2.java
-.class public dot.junit.opcodes.add_float.d.T_add_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- const-wide v0, 3.1415
- add-float v0, v3, v0
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_3.d
deleted file mode 100644
index 7de8486..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_3.java
-.class public dot.junit.opcodes.add_float.d.T_add_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- const-wide v0, 3141523
- add-float v0, v0, v3
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_4.d
deleted file mode 100644
index 443ed0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_4.java
-.class public dot.junit.opcodes.add_float.d.T_add_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- add-float v0, v2, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_5.d
deleted file mode 100644
index efcd143..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_5.java
-.class public dot.junit.opcodes.add_float.d.T_add_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)F
-.limit regs 4
- add-float v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_5.java b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_5.java
deleted file mode 100644
index 403a198..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_float.d;
-
-public class T_add_float_5 {
-
- public float run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_6.d
deleted file mode 100644
index 061a4da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float/d/T_add_float_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_6.java
-.class public dot.junit.opcodes.add_float.d.T_add_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- add-float v0, v2, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java
deleted file mode 100644
index 5824a70..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_float_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_1;
-import dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_5;
-
-public class Test_add_float_2addr extends DxTestCase {
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(5.84f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Arguments = 0, -3.14f
- */
- public void testN2() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(-3.14f, t.run(0, -3.14f));
- }
-
- /**
- * @title Arguments = -3.14f, -2.7f
- */
- public void testN3() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(-5.84f, t.run(-3.14f, -2.7f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this sum of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_add_float_2addr_5 t = new T_add_float_2addr_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(3.3028235E38f, 0.11E38f));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertTrue(Float.isNaN(t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY)));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.POSITIVE_INFINITY
- */
- public void testB3() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB4() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = +0, -0f
- */
- public void testB5() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(+0f, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = -0f, -0f
- */
- public void testB6() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(-0f, t.run(-0f, -0f));
- }
-
- /**
- * @title Arguments = -2.7f, 2.7f
- */
- public void testB7() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(+0f, t.run(-2.7f, 2.7f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.MAX_VALUE
- */
- public void testB8() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
- Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE, -1.4E-45f
- */
- public void testB9() {
- T_add_float_2addr_1 t = new T_add_float_2addr_1();
- assertEquals(0f, t.run(Float.MIN_VALUE, -1.4E-45f));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.d
deleted file mode 100644
index 38344b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2addr_1.java
-.class public dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- add-float/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.java
deleted file mode 100644
index a872040..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_float_2addr.d;
-
-public class T_add_float_2addr_1 {
-
- public float run(float a, float b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2.d
deleted file mode 100644
index dd35d2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2addr_2.java
-.class public dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- const-wide v0, 3.1415
- add-float/2addr v3, v0
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3.d
deleted file mode 100644
index 6c0eb9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2addr_3.java
-.class public dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- const-wide v0, 3141523
- add-float/2addr v0, v3
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4.d
deleted file mode 100644
index c9832e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2addr_4.java
-.class public dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- add-float/2addr v2, v1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.d
deleted file mode 100644
index 281b673..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2addr_5.java
-.class public dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)F
-.limit regs 4
- add-float/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.java
deleted file mode 100644
index afdfb51..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_float_2addr.d;
-
-public class T_add_float_2addr_5 {
-
- public float run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6.d
deleted file mode 100644
index 2aa078c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_float_2addr_6.java
-.class public dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- add-float/2addr v2, v4
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/Test_add_int.java b/tools/vm-tests/src/dot/junit/opcodes/add_int/Test_add_int.java
deleted file mode 100644
index f952b82..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/Test_add_int.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_int.d.T_add_int_1;
-import dot.junit.opcodes.add_int.d.T_add_int_5;
-
-public class Test_add_int extends DxTestCase {
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(12, t.run(8, 4));
- }
-
- /**
- * @title Arguments = 0, 255
- */
- public void testN2() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(255, t.run(0, 255));
- }
-
- /**
- * @title Arguments = 0, -65536
- */
- public void testN3() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(-65536, t.run(0, -65536));
- }
-
- /**
- * @title Arguments = 0, -2147483647
- */
- public void testN4() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(-2147483647, t.run(0, -2147483647));
- }
-
- /**
- * @title Arguments = 0x7ffffffe, 2
- */
- public void testN5() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(-2147483648, t.run(0x7ffffffe, 2));
- }
-
- /**
- * @title Arguments = -1, 1
- */
- public void testN6() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(0, t.run(-1, 1));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this sum of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_add_int_5 t = new T_add_int_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0, Integer.MAX_VALUE
- */
- public void testB1() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(0, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(-2, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB3() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB4() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(-2147483647, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
- */
- public void testB6() {
- T_add_int_1 t = new T_add_int_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_1.d
deleted file mode 100644
index bd71e35..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_1.java
-.class public dot.junit.opcodes.add_int.d.T_add_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_1.java
deleted file mode 100644
index 6b9c617..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int.d;
-
-public class T_add_int_1 {
-
- public int run(int a, int b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_2.d
deleted file mode 100644
index 83cb90c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2.java
-.class public dot.junit.opcodes.add_int.d.T_add_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- add-int v0, v2, v0
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_3.d
deleted file mode 100644
index 84db6e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_3.java
-.class public dot.junit.opcodes.add_int.d.T_add_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 33231415
- add-int v0, v0, v3
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_4.d
deleted file mode 100644
index 0ce8bbc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_4.java
-.class public dot.junit.opcodes.add_int.d.T_add_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int v0, v1, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_5.d
deleted file mode 100644
index a92add0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_5.java
-.class public dot.junit.opcodes.add_int.d.T_add_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
- add-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_5.java
deleted file mode 100644
index fa7efca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int.d;
-
-public class T_add_int_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_6.d
deleted file mode 100644
index 3dac6df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int/d/T_add_int_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_6.java
-.class public dot.junit.opcodes.add_int.d.T_add_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int v0, v2, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java
deleted file mode 100644
index 4804246..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_1;
-import dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_5;
-
-public class Test_add_int_2addr extends DxTestCase {
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(12, t.run(8, 4));
- }
-
- /**
- * @title Arguments = 0, 255
- */
- public void testN2() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(255, t.run(0, 255));
- }
-
- /**
- * @title Arguments = 0, -65536
- */
- public void testN3() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(-65536, t.run(0, -65536));
- }
-
- /**
- * @title Arguments = 0, -2147483647
- */
- public void testN4() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(-2147483647, t.run(0, -2147483647));
- }
-
- /**
- * @title Arguments = 0x7ffffffe, 2
- */
- public void testN5() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(-2147483648, t.run(0x7ffffffe, 2));
- }
-
- /**
- * @title Arguments = -1, 1
- */
- public void testN6() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(0, t.run(-1, 1));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this sum of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_add_int_2addr_5 t = new T_add_int_2addr_5();
- try {
- t.run(1, 2f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Integer.MAX_VALUE
- */
- public void testB1() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(Integer.MAX_VALUE, t.run(0, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(-2, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB3() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB4() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(-2147483647, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
- */
- public void testB6() {
- T_add_int_2addr_1 t = new T_add_int_2addr_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.d
deleted file mode 100644
index 980379c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2addr_1.java
-.class public dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.java
deleted file mode 100644
index d5dc9c8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_2addr.d;
-
-public class T_add_int_2addr_1 {
-
- public int run(int a, int b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2.d
deleted file mode 100644
index bc0c3ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2addr_2.java
-.class public dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- add-int/2addr v2, v0
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3.d
deleted file mode 100644
index c47322e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2addr_3.java
-.class public dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 33231415
- add-int/2addr v0, v3
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4.d
deleted file mode 100644
index 7b4adf8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2addr_4.java
-.class public dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/2addr v1, v3
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.d
deleted file mode 100644
index 042e671..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2addr_5.java
-.class public dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
- add-int/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.java
deleted file mode 100644
index 5161361..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_2addr.d;
-
-public class T_add_int_2addr_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6.d
deleted file mode 100644
index 50a14a9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_2addr_6.java
-.class public dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/2addr v2, v4
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java
deleted file mode 100644
index 1400145..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_16;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_5;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_1;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_10;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_11;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_12;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_2;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_3;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_4;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_6;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_7;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_8;
-import dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_9;
-
-public class Test_add_int_lit16 extends DxTestCase {
- /**
- * @title Arguments = 8 + 4
- */
- public void testN1() {
- T_add_int_lit16_1 t = new T_add_int_lit16_1();
- assertEquals(12, t.run());
- }
-
- /**
- * @title Arguments = 0 + 255
- */
- public void testN2() {
- T_add_int_lit16_2 t = new T_add_int_lit16_2();
- assertEquals(255, t.run());
- }
-
- /**
- * @title Arguments = 0 + (-32768)
- */
- public void testN3() {
- T_add_int_lit16_3 t = new T_add_int_lit16_3();
- assertEquals(-32768, t.run());
- }
-
- /**
- * @title Arguments = (-2147483647) + 0
- */
- public void testN4() {
- T_add_int_lit16_4 t = new T_add_int_lit16_4();
- assertEquals(-2147483647, t.run());
- }
-
- /**
- * @title Arguments = 0x7ffffffe + 2
- */
- public void testN5() {
- T_add_int_lit16_5 t = new T_add_int_lit16_5();
- assertEquals(-2147483648, t.run());
- }
-
- /**
- * @title Arguments = -1 + 1
- */
- public void testN6() {
- T_add_int_lit16_6 t = new T_add_int_lit16_6();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this sum of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_add_int_lit16_16 t = new T_add_int_lit16_16();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 + Short.MAX_VALUE
- */
- public void testB1() {
- T_add_int_lit16_7 t = new T_add_int_lit16_7();
- assertEquals(Short.MAX_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE + Short.MAX_VALUE
- */
- public void testB2() {
- T_add_int_lit16_8 t = new T_add_int_lit16_8();
- assertEquals(-2147450882, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE + 1
- */
- public void testB3() {
- T_add_int_lit16_9 t = new T_add_int_lit16_9();
- assertEquals(Integer.MIN_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE + 1
- */
- public void testB4() {
- T_add_int_lit16_10 t = new T_add_int_lit16_10();
- assertEquals(-2147483647, t.run());
- }
-
- /**
- * @title Arguments = 0 + 0
- */
- public void testB5() {
- T_add_int_lit16_11 t = new T_add_int_lit16_11();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = Short.MIN_VALUE + Short.MIN_VALUE
- */
- public void testB6() {
- T_add_int_lit16_12 t = new T_add_int_lit16_12();
- assertEquals(-65536, t.run());
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.d
deleted file mode 100644
index b79b0f6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_1.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 8
- add-int/lit16 v0, v1, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.java
deleted file mode 100644
index 93da1b1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_1 {
-
- public int run() {
- return 8 + 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.d
deleted file mode 100644
index c8b348a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_10.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -2147483648
- add-int/lit16 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.java
deleted file mode 100644
index 2b30e1d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_10 {
-
- public int run() {
- return Integer.MIN_VALUE + 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.d
deleted file mode 100644
index 26fe8ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_11.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit16 v0, v1, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.java
deleted file mode 100644
index e9e8461..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_11 {
-
- public int run() {
- return 0 + 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.d
deleted file mode 100644
index 34af2a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_12.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -32768
- add-int/lit16 v0, v1, -32768
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.java
deleted file mode 100644
index bbed57b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_12 {
-
- public int run() {
- return Short.MIN_VALUE + Short.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13.d
deleted file mode 100644
index 95fd121..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_13.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- add-int/lit16 v0, v0, 1
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14.d
deleted file mode 100644
index dfa3742..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_14.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 33231415
- add-int/lit16 v0, v0, 1
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15.d
deleted file mode 100644
index 6cc4b57..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_15.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/lit16 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.d
deleted file mode 100644
index ba09106..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_16.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
- add-int/lit16 v0, v3, 123
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.java
deleted file mode 100644
index 50fd369..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_16 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17.d
deleted file mode 100644
index bc66cbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_17.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/lit16 v0, v4, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.d
deleted file mode 100644
index d80497f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_2.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit16 v0, v1, 255
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.java
deleted file mode 100644
index 3a6c2c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_2 {
-
- public int run() {
- return 0 + 255;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.d
deleted file mode 100644
index 3a9009d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_3.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit16 v0, v1, -32768
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.java
deleted file mode 100644
index c523fd1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_3 {
-
- public int run() {
- return 0 + (-32768);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.d
deleted file mode 100644
index 141d546..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_4.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -2147483647
- add-int/lit16 v0, v1, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.java
deleted file mode 100644
index 980de4a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_4 {
-
- public int run() {
- return (-2147483647) + 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.d
deleted file mode 100644
index 54f42ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_5.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0x7ffffffe
- add-int/lit16 v0, v1, 2
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.java
deleted file mode 100644
index f22579d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_5 {
-
- public int run() {
- return 0x7ffffffe + 2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.d
deleted file mode 100644
index b103f66..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_6.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1
- add-int/lit16 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.java
deleted file mode 100644
index 342df4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_6 {
-
- public int run() {
- return -1 + 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.d
deleted file mode 100644
index b4d689f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_7.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit16 v0, v1, 32767
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.java
deleted file mode 100644
index afd6e25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_7 {
-
- public int run() {
- return 0 + Short.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.d
deleted file mode 100644
index e1aa77e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_8.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- add-int/lit16 v0, v1, 32767
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.java
deleted file mode 100644
index c63d9e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_8 {
-
- public int run() {
- return Integer.MAX_VALUE + Short.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.d
deleted file mode 100644
index 74d8cc0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit16_9.java
-.class public dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- add-int/lit16 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.java
deleted file mode 100644
index 71613ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit16.d;
-
-public class T_add_int_lit16_9 {
-
- public int run() {
- return Integer.MAX_VALUE + 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java
deleted file mode 100644
index f9b3eef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_16;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_1;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_10;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_11;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_12;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_2;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_3;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_4;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_5;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_6;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_7;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_8;
-import dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_9;
-
-public class Test_add_int_lit8 extends DxTestCase {
- /**
- * @title Arguments = 8 + 4
- */
- public void testN1() {
- T_add_int_lit8_1 t = new T_add_int_lit8_1();
- assertEquals(12, t.run());
- }
-
- /**
- * @title Arguments = Byte.MIN_VALUE + Byte.MAX_VALUE
- */
- public void testN2() {
- T_add_int_lit8_2 t = new T_add_int_lit8_2();
- assertEquals(-1, t.run());
- }
-
- /**
- * @title Arguments = 0 + (-128)
- */
- public void testN3() {
- T_add_int_lit8_3 t = new T_add_int_lit8_3();
- assertEquals(-128, t.run());
- }
-
- /**
- * @title Arguments = (-2147483647) + 0
- */
- public void testN4() {
- T_add_int_lit8_4 t = new T_add_int_lit8_4();
- assertEquals(-2147483647, t.run());
- }
-
- /**
- * @title Arguments = 0x7ffffffe + 2
- */
- public void testN5() {
- T_add_int_lit8_5 t = new T_add_int_lit8_5();
- assertEquals(-2147483648, t.run());
- }
-
- /**
- * @title Arguments = -1 + 1
- */
- public void testN6() {
- T_add_int_lit8_6 t = new T_add_int_lit8_6();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this sum of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_add_int_lit8_16 t = new T_add_int_lit8_16();
- try {
- t.run(3f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 + Byte.MAX_VALUE
- */
- public void testB1() {
- T_add_int_lit8_7 t = new T_add_int_lit8_7();
- assertEquals(Byte.MAX_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE + Byte.MAX_VALUE
- */
- public void testB2() {
- T_add_int_lit8_8 t = new T_add_int_lit8_8();
- assertEquals(-2147483522, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE + 1
- */
- public void testB3() {
- T_add_int_lit8_9 t = new T_add_int_lit8_9();
- assertEquals(Integer.MIN_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE + 1
- */
- public void testB4() {
- T_add_int_lit8_10 t = new T_add_int_lit8_10();
- assertEquals(-2147483647, t.run());
- }
-
- /**
- * @title Arguments = 0 + 0
- */
- public void testB5() {
- T_add_int_lit8_11 t = new T_add_int_lit8_11();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = Short.MIN_VALUE + Byte.MIN_VALUE
- */
- public void testB6() {
- T_add_int_lit8_12 t = new T_add_int_lit8_12();
- assertEquals(-32896, t.run());
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.d
deleted file mode 100644
index 5286f6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_1.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 8
- add-int/lit8 v0, v1, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.java
deleted file mode 100644
index 732ee8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_1 {
-
- public int run() {
- return 8 + 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.d
deleted file mode 100644
index 9ef34ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_10.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -2147483648
- add-int/lit8 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.java
deleted file mode 100644
index 68c301d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_10 {
-
- public int run() {
- return Integer.MIN_VALUE + 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.d
deleted file mode 100644
index 88c76b3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_11.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit8 v0, v1, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.java
deleted file mode 100644
index 43b33cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_11 {
-
- public int run() {
- return 0 + 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.d
deleted file mode 100644
index a8776f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_12.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -32768
- add-int/lit8 v0, v1, -128
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.java
deleted file mode 100644
index cfb1577..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_12 {
-
- public int run() {
- return Short.MIN_VALUE + Byte.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13.d
deleted file mode 100644
index d5a468b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_13.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- add-int/lit8 v0, v0, 1
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14.d
deleted file mode 100644
index 873fff0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_14.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 33231415
- add-int/lit8 v0, v0, 1
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15.d
deleted file mode 100644
index 28b894e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_15.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/lit8 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.d
deleted file mode 100644
index 3d4d8c1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_16.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
- add-int/lit8 v0, v3, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.java
deleted file mode 100644
index c482a64..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_16 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17.d
deleted file mode 100644
index 6bdf030..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_17.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- add-int/lit8 v0, v4, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.d
deleted file mode 100644
index ef0a0fa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_2.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -128
- add-int/lit8 v0, v1, 127
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.java
deleted file mode 100644
index acf2a79..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_2 {
-
- public int run() {
- return Byte.MIN_VALUE + Byte.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.d
deleted file mode 100644
index 9a49def..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_3.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit8 v0, v1, -128
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.java
deleted file mode 100644
index 8c10f8f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_3 {
-
- public int run() {
- return 0 + (-128);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.d
deleted file mode 100644
index a3fd7dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_4.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -2147483647
- add-int/lit8 v0, v1, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.java
deleted file mode 100644
index 06a8fad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_4 {
-
- public int run() {
- return (-2147483647) + 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.d
deleted file mode 100644
index ab9f0ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_5.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0x7ffffffe
- add-int/lit8 v0, v1, 2
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.java
deleted file mode 100644
index 6691276..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_5 {
-
- public int run() {
- return 0x7ffffffe + 2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.d
deleted file mode 100644
index 4ea7fdb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_6.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1
- add-int/lit8 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.java
deleted file mode 100644
index 122a899..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_6 {
-
- public int run() {
- return -1 + 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.d
deleted file mode 100644
index 01fdc0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_7.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- add-int/lit8 v0, v1, 127
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.java
deleted file mode 100644
index 7ec523e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_7 {
-
- public int run() {
- return 0 + Byte.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.d
deleted file mode 100644
index 75d74b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_8.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- add-int/lit8 v0, v1, 127
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.java
deleted file mode 100644
index 957ccee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_8 {
-
- public int run() {
- return Integer.MAX_VALUE + Byte.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.d
deleted file mode 100644
index a28afd0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_int_lit8_9.java
-.class public dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- add-int/lit8 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.java
deleted file mode 100644
index bdc657c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_int_lit8.d;
-
-public class T_add_int_lit8_9 {
-
- public int run() {
- return Integer.MAX_VALUE + 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/Test_add_long.java b/tools/vm-tests/src/dot/junit/opcodes/add_long/Test_add_long.java
deleted file mode 100644
index 301879a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/Test_add_long.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_long.d.T_add_long_1;
-import dot.junit.opcodes.add_long.d.T_add_long_6;
-
-public class Test_add_long extends DxTestCase {
- /**
- * @title Arguments = 12345678l, 87654321l
- */
- public void testN1() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(99999999l, t.run(12345678l, 87654321l));
- }
-
- /**
- * @title Arguments = 0l, 87654321l
- */
- public void testN2() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(87654321l, t.run(0l, 87654321l));
- }
-
- /**
- * @title Arguments = -12345678l, 0l
- */
- public void testN3() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(-12345678l, t.run(-12345678l, 0l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this sum of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_add_long_6 t = new T_add_long_6();
- try {
- t.run();
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 + Long.MAX_VALUE
- */
- public void testB1() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(9223372036854775807L, t.run(0l, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 0 + Long.MIN_VALUE
- */
- public void testB2() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(-9223372036854775808L, t.run(0l, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0 + 0
- */
- public void testB3() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(0l, t.run(0l, 0l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE + Long.MAX_VALUE
- */
- public void testB4() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(-2, t.run(Long.MAX_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE + Long.MIN_VALUE
- */
- public void testB5() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(-1l, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE + Long.MIN_VALUE
- */
- public void testB6() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE + 1
- */
- public void testB7() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(-9223372036854775807l, t.run(Long.MIN_VALUE, 1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE + 1
- */
- public void testB8() {
- T_add_long_1 t = new T_add_long_1();
- assertEquals(-9223372036854775808l, t.run(Long.MAX_VALUE, 1l));
- }
-
-
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / integer
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_1.d
deleted file mode 100644
index 2dc5518..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_1.java
-.class public dot.junit.opcodes.add_long.d.T_add_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- add-long v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_1.java
deleted file mode 100644
index a6bd026..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_long.d;
-
-public class T_add_long_1 {
-
- public long run(long a, long b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_2.d
deleted file mode 100644
index 83eaa73..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2.java
-.class public dot.junit.opcodes.add_long.d.T_add_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- add-long v0, v3, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_3.d
deleted file mode 100644
index 3935188..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_3.java
-.class public dot.junit.opcodes.add_long.d.T_add_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- const v5, 12345
- add-long v0, v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_4.d
deleted file mode 100644
index 9dab202..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_4.java
-.class public dot.junit.opcodes.add_long.d.T_add_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- const v5, 12345.0
- add-long v0, v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_5.d
deleted file mode 100644
index 5c57aeb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_5.java
-.class public dot.junit.opcodes.add_long.d.T_add_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- add-long v0, v2, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_6.d
deleted file mode 100644
index 435256f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_6.java
-.class public dot.junit.opcodes.add_long.d.T_add_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 7
-
- const-wide v2, 31415
- const-wide v4, 3.1415
- add-long v0, v2, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_6.java b/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_6.java
deleted file mode 100644
index 4cdc6c5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long/d/T_add_long_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_long.d;
-
-public class T_add_long_6 {
-
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java
deleted file mode 100644
index c3ef53c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_1;
-import dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_6;
-
-public class Test_add_long_2addr extends DxTestCase {
- /**
- * @title Arguments = 12345678l, 87654321l
- */
- public void testN1() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(99999999l, t.run(12345678l, 87654321l));
- }
-
- /**
- * @title Arguments = 0l, 87654321l
- */
- public void testN2() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(87654321l, t.run(0l, 87654321l));
- }
-
- /**
- * @title Arguments = -12345678l, 0l
- */
- public void testN3() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(-12345678l, t.run(-12345678l, 0l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this sum of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_add_long_2addr_6 t = new T_add_long_2addr_6();
- try {
- t.run();
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 + Long.MAX_VALUE
- */
- public void testB1() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(9223372036854775807L, t.run(0l, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 0 + Long.MIN_VALUE
- */
- public void testB2() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(0l, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0 + 0
- */
- public void testB3() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(0l, t.run(0l, 0l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE + Long.MAX_VALUE
- */
- public void testB4() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(-2, t.run(Long.MAX_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE + Long.MIN_VALUE
- */
- public void testB5() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(-1l, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE + Long.MIN_VALUE
- */
- public void testB6() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE + 1
- */
- public void testB7() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(-9223372036854775807l, t.run(Long.MIN_VALUE, 1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE + 1
- */
- public void testB8() {
- T_add_long_2addr_1 t = new T_add_long_2addr_1();
- assertEquals(-9223372036854775808l, t.run(Long.MAX_VALUE, 1l));
- }
-
-
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / integer
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / long
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.d
deleted file mode 100644
index ec11b7a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2addr_1.java
-.class public dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- add-long/2addr v3, v5
- return-wide v3
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.java
deleted file mode 100644
index e799c7f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_long_2addr.d;
-
-public class T_add_long_2addr_1 {
-
- public long run(long a, long b) {
- return a+b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2.d
deleted file mode 100644
index 8172613..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2addr_2.java
-.class public dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- add-long/2addr v3, v7
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3.d
deleted file mode 100644
index e10a72a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2addr_3.java
-.class public dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- const v5, 12345
- add-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_4.d
deleted file mode 100644
index 1073b6c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2addr_4.java
-.class public dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- const v5, 12345.0
- add-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5.d
deleted file mode 100644
index 3455016..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2addr_5.java
-.class public dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- add-long/2addr v2, v5
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.d
deleted file mode 100644
index 7c842cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_add_long_2addr_6.java
-.class public dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 7
-
- const-wide v2, 31415
- const-wide v4, 3.1415
- add-long/2addr v2, v4
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.java
deleted file mode 100644
index 8badad9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.add_long_2addr.d;
-
-public class T_add_long_2addr_6 {
-
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/Test_aget.java b/tools/vm-tests/src/dot/junit/opcodes/aget/Test_aget.java
deleted file mode 100644
index d33e943..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/Test_aget.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget.d.T_aget_1;
-import dot.junit.opcodes.aget.d.T_aget_8;
-
-public class Test_aget extends DxTestCase {
- /**
- * @title get int from array
- */
- public void testN1() {
- T_aget_1 t = new T_aget_1();
- int[] arr = new int[2];
- arr[1] = 100000000;
- assertEquals(100000000, t.run(arr, 1));
- }
-
- /**
- * @title get int from array
- */
- public void testN2() {
- T_aget_1 t = new T_aget_1();
- int[] arr = new int[2];
- arr[0] = 100000000;
- assertEquals(100000000, t.run(arr, 0));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- int[] arr = new int[2];
- T_aget_8 t = new T_aget_8();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_1 t = new T_aget_1();
- int[] arr = new int[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aget_1 t = new T_aget_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aget_1 t = new T_aget_1();
- int[] arr = new int[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_1.d
deleted file mode 100644
index 549fdb5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_1.java
-.class public dot.junit.opcodes.aget.d.T_aget_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)I
-.limit regs 9
-
- aget v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_1.java
deleted file mode 100644
index 75a2874..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget.d;
-
-public class T_aget_1 {
- public int run(int[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_2.d
deleted file mode 100644
index 2d31759..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_2.java
-.class public dot.junit.opcodes.aget.d.T_aget_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ID)I
-.limit regs 9
-
- aget v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_3.d
deleted file mode 100644
index 72731ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_3.java
-.class public dot.junit.opcodes.aget.d.T_aget_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([IJ)I
-.limit regs 9
-
- aget v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_4.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_4.d
deleted file mode 100644
index 8e3b970..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_4.java
-.class public dot.junit.opcodes.aget.d.T_aget_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)I
-.limit regs 9
-
- aget v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_5.d
deleted file mode 100644
index e0d2005..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_5.java
-.class public dot.junit.opcodes.aget.d.T_aget_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DI)I
-.limit regs 9
-
- aget v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_6.d
deleted file mode 100644
index 41a009c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_6.java
-.class public dot.junit.opcodes.aget.d.T_aget_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)I
-.limit regs 9
-
- aget v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_7.d
deleted file mode 100644
index 8b2c021..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_7.java
-.class public dot.junit.opcodes.aget.d.T_aget_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)I
-.limit regs 9
-
- aget v0, v7, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_8.d
deleted file mode 100644
index e91d276..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_8.java
-.class public dot.junit.opcodes.aget.d.T_aget_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([IF)I
-.limit regs 9
-
- aget v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_8.java b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_8.java
deleted file mode 100644
index 1174ced..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget.d;
-
-public class T_aget_8 {
- public int run(int[] arr, float idx) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_9.d
deleted file mode 100644
index 51fe7a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget/d/T_aget_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_9.java
-.class public dot.junit.opcodes.aget.d.T_aget_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)I
-.limit regs 9
-
- aget v0, v7, v9
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java
deleted file mode 100644
index 3d8bd6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_boolean;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget_boolean.d.T_aget_boolean_1;
-import dot.junit.opcodes.aget_boolean.d.T_aget_boolean_8;
-
-public class Test_aget_boolean extends DxTestCase {
- /**
- * @title get boolean from array
- */
- public void testN1() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- boolean[] arr = new boolean[2];
- arr[1] = true;
- assertEquals(true, t.run(arr, 1));
- }
-
- /**
- * @title get boolean from array
- */
- public void testN2() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- boolean[] arr = new boolean[2];
- arr[0] = true;
- assertEquals(true, t.run(arr, 0));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- boolean[] arr = new boolean[2];
- T_aget_boolean_8 t = new T_aget_boolean_8();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.d
deleted file mode 100644
index 6fbf9bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_1.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZI)Z
-.limit regs 9
-
- aget-boolean v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.java
deleted file mode 100644
index 5ab595d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_boolean.d;
-
-public class T_aget_boolean_1 {
- public boolean run(boolean[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_2.d
deleted file mode 100644
index e858a8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_2.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZD)Z
-.limit regs 9
-
- aget-boolean v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_3.d
deleted file mode 100644
index 07133df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_3.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZJ)Z
-.limit regs 9
-
- aget-boolean v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_4.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_4.d
deleted file mode 100644
index 28f6cb1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_4.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)Z
-.limit regs 9
-
- aget-boolean v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_5.d
deleted file mode 100644
index e1c1ffe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_5.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DI)Z
-.limit regs 9
-
- aget-boolean v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_6.d
deleted file mode 100644
index ef79c81..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_6.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)Z
-.limit regs 9
-
- aget-boolean v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_7.d
deleted file mode 100644
index da3663c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_7.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZI)Z
-.limit regs 9
-
- aget-boolean v0, v7, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.d
deleted file mode 100644
index 5c36f5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_8.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZF)Z
-.limit regs 9
-
- aget-boolean v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.java b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.java
deleted file mode 100644
index ff40523..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_boolean.d;
-
-public class T_aget_boolean_8 {
- public boolean run(boolean[] arr, float idx) {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_9.d
deleted file mode 100644
index cbd51e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_boolean_9.java
-.class public dot.junit.opcodes.aget_boolean.d.T_aget_boolean_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZI)Z
-.limit regs 9
-
- aget-boolean v0, v7, v9
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java
deleted file mode 100644
index fcaeab4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget_byte.d.T_aget_byte_1;
-import dot.junit.opcodes.aget_byte.d.T_aget_byte_8;
-
-
-public class Test_aget_byte extends DxTestCase {
- /**
- * @title get byte from array
- */
- public void testN1() {
- T_aget_byte_1 t = new T_aget_byte_1();
- byte[] arr = new byte[2];
- arr[1] = 100;
- assertEquals(100, t.run(arr, 1));
- }
-
- /**
- * @title get byte from array
- */
- public void testN2() {
- T_aget_byte_1 t = new T_aget_byte_1();
- byte[] arr = new byte[2];
- arr[0] = 100;
- assertEquals(100, t.run(arr, 0));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
- public void testN3() {
- byte[] arr = new byte[2];
- T_aget_byte_8 t = new T_aget_byte_8();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_byte_1 t = new T_aget_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aget_byte_1 t = new T_aget_byte_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aget_byte_1 t = new T_aget_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, short
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int[], int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.d
deleted file mode 100644
index 2fa8a9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_1.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BI)B
-.limit regs 9
-
- aget-byte v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.java
deleted file mode 100644
index 72646a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_byte.d;
-
-public class T_aget_byte_1 {
- public byte run(byte[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_2.d
deleted file mode 100644
index 11eba1a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_2.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BI)B
-.limit regs 9
-
- const-wide v1, 1.0
- aget-byte v0, v7, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_3.d
deleted file mode 100644
index c2b426b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_3.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BI)B
-.limit regs 9
-
- const-wide v1, 1
- aget-byte v0, v7, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_4.d
deleted file mode 100644
index 905f4b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_4.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)B
-.limit regs 9
-
- aget-byte v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_5.d
deleted file mode 100644
index b65b94e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_5.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DI)B
-.limit regs 9
-
- aget-byte v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_6.d
deleted file mode 100644
index 6861fa4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_6.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)B
-.limit regs 9
-
- aget-byte v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_7.d
deleted file mode 100644
index 03ab879..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_7.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BI)B
-.limit regs 9
-
- aget-byte v0, v7, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.d
deleted file mode 100644
index 92f0273..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_8.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BF)B
-.limit regs 9
-
- aget-byte v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.java b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.java
deleted file mode 100644
index af7c391..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_byte.d;
-
-public class T_aget_byte_8 {
- public byte run(byte[] arr, float idx) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_9.d
deleted file mode 100644
index b2d4ffd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_byte_9.java
-.class public dot.junit.opcodes.aget_byte.d.T_aget_byte_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BI)B
-.limit regs 9
-
- aget-byte v0, v7, v9
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/Test_aget_char.java b/tools/vm-tests/src/dot/junit/opcodes/aget_char/Test_aget_char.java
deleted file mode 100644
index 8871a9e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/Test_aget_char.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget_char.d.T_aget_char_1;
-import dot.junit.opcodes.aget_char.d.T_aget_char_8;
-
-public class Test_aget_char extends DxTestCase {
- /**
- * @title get char from array
- */
- public void testN1() {
- T_aget_char_1 t = new T_aget_char_1();
- char[] arr = new char[2];
- arr[1] = 'g';
- assertEquals('g', t.run(arr, 1));
- }
-
- /**
- * @title get char from array
- */
- public void testN2() {
- T_aget_char_1 t = new T_aget_char_1();
- char[] arr = new char[2];
- arr[0] = 'g';
- assertEquals('g', t.run(arr, 0));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- char[] arr = new char[2];
- T_aget_char_8 t = new T_aget_char_8();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_char_1 t = new T_aget_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aget_char_1 t = new T_aget_char_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aget_char_1 t = new T_aget_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, char
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], char
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int[], int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.d
deleted file mode 100644
index 0789458..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_1.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CI)C
-.limit regs 9
-
- aget-char v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.java
deleted file mode 100644
index b15a052..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_char.d;
-
-public class T_aget_char_1 {
- public char run(char[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_2.d
deleted file mode 100644
index ff1b8fd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_2.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CD)C
-.limit regs 9
-
- aget-char v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_3.d
deleted file mode 100644
index b197a3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_3.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CJ)C
-.limit regs 9
-
- aget-char v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_4.d
deleted file mode 100644
index 53904af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_4.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)C
-.limit regs 9
-
- aget-char v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_5.d
deleted file mode 100644
index ed9a20d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_5.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DI)C
-.limit regs 9
-
- aget-char v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_6.d
deleted file mode 100644
index 04cee20..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_6.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)C
-.limit regs 9
-
- aget-char v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_7.d
deleted file mode 100644
index 508f6fb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_7.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CI)C
-.limit regs 9
-
- aget-char v0, v7, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.d
deleted file mode 100644
index daaa044..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_8.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CF)C
-.limit regs 9
-
- aget-char v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.java b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.java
deleted file mode 100644
index 8cf681a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_char.d;
-
-public class T_aget_char_8 {
- public char run(char[] arr, float idx) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_9.d
deleted file mode 100644
index 4053996..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_char/d/T_aget_char_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_char_9.java
-.class public dot.junit.opcodes.aget_char.d.T_aget_char_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CI)C
-.limit regs 9
-
- aget-char v0, v7, v9
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/Test_aget_object.java b/tools/vm-tests/src/dot/junit/opcodes/aget_object/Test_aget_object.java
deleted file mode 100644
index 691c57c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/Test_aget_object.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget_object.d.T_aget_object_1;
-import dot.junit.opcodes.aget_object.d.T_aget_object_8;
-
-
-public class Test_aget_object extends DxTestCase {
- /**
- * @title get reference from array
- */
- public void testN1() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = new String[] {"a", "b"};
- assertEquals("a", t.run(arr, 0));
- }
-
- /**
- * @title get reference from array
- */
- public void testN2() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = new String[] {"a", "b"};
- assertEquals("b", t.run(arr, 1));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- String[] arr = new String[] {"a", "b"};
- T_aget_object_8 t = new T_aget_object_8();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = new String[] {"a", "b"};
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aioobe) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE2() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = new String[] {"a", "b"};
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aioobe) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE3() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = null;
- try {
- t.run(arr, 0);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float[], int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.d
deleted file mode 100644
index 8f4a03b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_1.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v8
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.java
deleted file mode 100644
index 03345c9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_object.d;
-
-public class T_aget_object_1 {
-
- public String run(String [] arr, int idx) {
- return arr[idx];
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_2.d
deleted file mode 100644
index cbdd6b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_2.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-.limit regs 9
-
- const-wide v1, 1.0
- aget-object v0, v7, v1
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_3.d
deleted file mode 100644
index c89b572..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_3.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-.limit regs 9
-
- const-wide v1, 1
- aget-object v0, v7, v1
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_4.d
deleted file mode 100644
index b881a16..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_4.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v8
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_5.d
deleted file mode 100644
index 7db8d5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_5.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([FI)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v8
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_6.d
deleted file mode 100644
index a349943..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_6.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v8
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_7.d
deleted file mode 100644
index 8b904d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_7.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v6
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.d
deleted file mode 100644
index 89ee37d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_8.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;F)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v8
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.java
deleted file mode 100644
index c8b33e2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_object.d;
-
-public class T_aget_object_8 {
-
- public String run(String [] arr, float idx) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_9.d
deleted file mode 100644
index e977101..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_object/d/T_aget_object_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_object_9.java
-.class public dot.junit.opcodes.aget_object.d.T_aget_object_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-.limit regs 9
-
- aget-object v0, v7, v9
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/Test_aget_short.java b/tools/vm-tests/src/dot/junit/opcodes/aget_short/Test_aget_short.java
deleted file mode 100644
index b0a12e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/Test_aget_short.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget_short.d.T_aget_short_1;
-import dot.junit.opcodes.aget_short.d.T_aget_short_8;
-
-public class Test_aget_short extends DxTestCase {
- /**
- * @title get short from array
- */
- public void testN1() {
- T_aget_short_1 t = new T_aget_short_1();
- short[] arr = new short[2];
- arr[1] = 10000;
- assertEquals(10000, t.run(arr, 1));
- }
-
- /**
- * @title get short from array
- */
- public void testN2() {
- T_aget_short_1 t = new T_aget_short_1();
- short[] arr = new short[2];
- arr[0] = 10000;
- assertEquals(10000, t.run(arr, 0));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- short[] arr = new short[2];
- T_aget_short_8 t = new T_aget_short_8();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_short_1 t = new T_aget_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aget_short_1 t = new T_aget_short_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aget_short_1 t = new T_aget_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int[], int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.d
deleted file mode 100644
index 3a1d451..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_1.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SI)S
-.limit regs 9
-
- aget-short v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.java
deleted file mode 100644
index d3ff01a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_short.d;
-
-public class T_aget_short_1 {
- public short run(short[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_2.d
deleted file mode 100644
index 67bb914..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_2.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SI)S
-.limit regs 9
-
- const-wide v1, 1.0
- aget-short v0, v7, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_3.d
deleted file mode 100644
index e55e873..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_3.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SI)S
-.limit regs 9
-
- const-wide v1, 1
- aget-short v0, v7, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_4.d
deleted file mode 100644
index 36e9428..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_4.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)S
-.limit regs 9
-
- aget-short v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_5.d
deleted file mode 100644
index 990a231..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_5.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DI)S
-.limit regs 9
-
- aget-short v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_6.d
deleted file mode 100644
index 5490c9f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_6.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)S
-.limit regs 9
-
- aget-short v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_7.d
deleted file mode 100644
index 06e1029..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_7.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SI)S
-.limit regs 9
-
- aget-short v0, v7, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.d
deleted file mode 100644
index 92f0d1c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_8.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SF)S
-.limit regs 9
-
- aget-short v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.java b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.java
deleted file mode 100644
index d661d27..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_short.d;
-
-public class T_aget_short_8 {
- public short run(short[] arr, float idx) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_9.d
deleted file mode 100644
index d337120..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_short/d/T_aget_short_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_short_9.java
-.class public dot.junit.opcodes.aget_short.d.T_aget_short_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SI)S
-.limit regs 9
-
- aget-short v0, v7, v9
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java
deleted file mode 100644
index 73b3357..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aget_wide.d.T_aget_wide_1;
-import dot.junit.opcodes.aget_wide.d.T_aget_wide_10;
-import dot.junit.opcodes.aget_wide.d.T_aget_wide_2;
-
-
-public class Test_aget_wide extends DxTestCase {
-
- /**
- * @title get long from array
- */
- public void testN1() {
- T_aget_wide_1 t = new T_aget_wide_1();
- long[] arr = new long[2];
- arr[1] = 1000000000000000000l;
- assertEquals(1000000000000000000l, t.run(arr, 1));
- }
-
- /**
- * @title get long from array
- */
- public void testN2() {
- T_aget_wide_1 t = new T_aget_wide_1();
- long[] arr = new long[2];
- arr[0] = 1000000000000000000l;
- assertEquals(1000000000000000000l, t.run(arr, 0));
- }
-
- /**
- * @title get double from array
- */
- public void testN3() {
- T_aget_wide_2 t = new T_aget_wide_2();
- double[] arr = new double[2];
- arr[0] = 3.1415d;
- assertEquals(3.1415d, t.run(arr, 0));
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float] makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- long[] arr = new long[2];
- T_aget_wide_10 t = new T_aget_wide_10();
- try {
- t.run(arr, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aget_wide_1 t = new T_aget_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aget_wide_1 t = new T_aget_wide_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException np) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aget_wide_1 t = new T_aget_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - Object, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int[], int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.d
deleted file mode 100644
index 08d842a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_1.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)J
-.limit regs 8
-
- aget-wide v0, v6, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.java
deleted file mode 100644
index fdc8575..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_wide.d;
-
-public class T_aget_wide_1 {
-
- public long run(long[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.d
deleted file mode 100644
index 5bbac0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_10.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JF)J
-.limit regs 8
-
- aget-wide v0, v6, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.java b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.java
deleted file mode 100644
index c5f66a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_wide.d;
-
-public class T_aget_wide_10 {
-
- public long run(long[] arr, float idx) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_11.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_11.d
deleted file mode 100644
index e174a37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_11.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_11.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)J
-.limit regs 8
-
- aget-wide v7, v6, v7
- return-wide v7
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.d
deleted file mode 100644
index 5372845..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_2.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DI)D
-.limit regs 8
-
- aget-wide v0, v6, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.java b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.java
deleted file mode 100644
index 1b2aace..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aget_wide.d;
-
-public class T_aget_wide_2 {
-
- public double run(double[] arr, int idx) {
- return arr[idx];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_3.d
deleted file mode 100644
index cf462df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_3.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)J
-.limit regs 8
-
- const-wide v2, 1.0
- aget-wide v0, v6, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_5.d
deleted file mode 100644
index 1c407ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_5.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)J
-.limit regs 8
-
- const-wide v2, 10
- aget-wide v0, v6, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_6.d
deleted file mode 100644
index 39054f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_6.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;I)J
-.limit regs 8
-
- aget-wide v0, v6, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_7.d
deleted file mode 100644
index ace153e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_7.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([II)J
-.limit regs 8
-
- aget-wide v0, v6, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_8.d
deleted file mode 100644
index dfe1b21..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_8.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)J
-.limit regs 8
-
- aget-wide v0, v6, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_9.d b/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_9.d
deleted file mode 100644
index fe00c45..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aget_wide_9.java
-.class public dot.junit.opcodes.aget_wide.d.T_aget_wide_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JI)J
-.limit regs 8
-
- aget-wide v0, v6, v8
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/Test_and_int.java b/tools/vm-tests/src/dot/junit/opcodes/and_int/Test_and_int.java
deleted file mode 100644
index 1422844..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/Test_and_int.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.and_int.d.T_and_int_1;
-import dot.junit.opcodes.and_int.d.T_and_int_5;
-
-
-public class Test_and_int extends DxTestCase {
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_and_int_1 t = new T_and_int_1();
- assertEquals(8, t.run(15, 8));
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfffffff1
- */
- public void testN2() {
- T_and_int_1 t = new T_and_int_1();
- assertEquals(0xfffffff0, t.run(0xfffffff8, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_and_int_1 t = new T_and_int_1();
- assertEquals(0xcafe, t.run(0xcafe, -1));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float & int) makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_and_int_5 t = new T_and_int_5();
- try {
- t.run(123, 44.44f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_and_int_1 t = new T_and_int_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
- */
- public void testB2() {
- T_and_int_1 t = new T_and_int_1();
- assertEquals(0, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_1.d
deleted file mode 100644
index b1f2984..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_1.java
-.class public dot.junit.opcodes.and_int.d.T_and_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_1.java
deleted file mode 100644
index 72c1c1e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int.d;
-
-public class T_and_int_1 {
-
- public int run(int a, int b) {
- return a & b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_2.d
deleted file mode 100644
index f57ddbc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2.java
-.class public dot.junit.opcodes.and_int.d.T_and_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- and-int v2, v0, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_3.d
deleted file mode 100644
index 033b3af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_3.java
-.class public dot.junit.opcodes.and_int.d.T_and_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 31415
- and-int v2, v0, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_4.d
deleted file mode 100644
index 9759124..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_4.java
-.class public dot.junit.opcodes.and_int.d.T_and_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int v0, v2, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_5.d
deleted file mode 100644
index b7480ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_5.java
-.class public dot.junit.opcodes.and_int.d.T_and_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
- and-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_5.java
deleted file mode 100644
index 4f547a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int.d;
-
-public class T_and_int_5 {
-
- public int run(int i, float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_6.d
deleted file mode 100644
index 7a3d212..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int/d/T_and_int_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_6.java
-.class public dot.junit.opcodes.and_int.d.T_and_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int v0, v2, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java
deleted file mode 100644
index bc8848b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_1;
-import dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_5;
-
-public class Test_and_int_2addr extends DxTestCase {
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_and_int_2addr_1 t = new T_and_int_2addr_1();
- assertEquals(8, t.run(15, 8));
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfffffff1
- */
- public void testN2() {
- T_and_int_2addr_1 t = new T_and_int_2addr_1();
- assertEquals(0xfffffff0, t.run(0xfffffff8, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_and_int_2addr_1 t = new T_and_int_2addr_1();
- assertEquals(0xcafe, t.run(0xcafe, -1));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float & int) makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_and_int_2addr_5 t = new T_and_int_2addr_5();
- try {
- t.run(1, 1.222f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_and_int_2addr_1 t = new T_and_int_2addr_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
- */
- public void testB2() {
- T_and_int_2addr_1 t = new T_and_int_2addr_1();
- assertEquals(0, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.d
deleted file mode 100644
index faf2f0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2addr_1.java
-.class public dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.java
deleted file mode 100644
index 4df72cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_2addr.d;
-
-public class T_and_int_2addr_1 {
-
- public int run(int a, int b) {
- return a & b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2.d
deleted file mode 100644
index 5906582..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2addr_2.java
-.class public dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- and-int/2addr v0, v3
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3.d
deleted file mode 100644
index 4d26208..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2addr_3.java
-.class public dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 31415
- and-int/2addr v0, v3
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4.d
deleted file mode 100644
index 6bfff72..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2addr_4.java
-.class public dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int/2addr v2, v1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.d
deleted file mode 100644
index c7183c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2addr_5.java
-.class public dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
- and-int/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.java
deleted file mode 100644
index 3cbb301..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_2addr.d;
-
-public class T_and_int_2addr_5 {
-
- public int run(int i, float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6.d
deleted file mode 100644
index b5d1901..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_2addr_6.java
-.class public dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int/2addr v2, v4
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java
deleted file mode 100644
index c1c8bc6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_5;
-import dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_1;
-import dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_2;
-import dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_3;
-import dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_4;
-import dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_9;
-
-public class Test_and_int_lit16 extends DxTestCase {
- /**
- * @title Arguments = 15 & 8
- */
- public void testN1() {
- T_and_int_lit16_1 t = new T_and_int_lit16_1();
- assertEquals(8, t.run());
- }
-
- /**
- * @title Arguments = 0xfffffff8 & -8
- */
- public void testN2() {
- T_and_int_lit16_2 t = new T_and_int_lit16_2();
- assertEquals(-8, t.run());
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_and_int_lit16_3 t = new T_and_int_lit16_3();
- assertEquals(0xcafe, t.run());
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float & int) makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_and_int_lit16_9 t = new T_and_int_lit16_9();
- try {
- t.run(11.33f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_and_int_lit16_4 t = new T_and_int_lit16_4();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = Short.MAX_VALUE & Short.MIN_VALUE
- */
- public void testB2() {
- T_and_int_lit16_5 t = new T_and_int_lit16_5();
- assertEquals(0, t.run());
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.d
deleted file mode 100644
index ebc9f85..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_1.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 15
- and-int/lit16 v0, v0, 8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.java
deleted file mode 100644
index 1f166e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16.d;
-
-public class T_and_int_lit16_1 {
-
- public int run() {
- return 15 & 8;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10.d
deleted file mode 100644
index ce46afc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_10.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int/lit16 v0, v4, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.d
deleted file mode 100644
index a76ada7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_2.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, -7
- and-int/lit16 v0, v0, -8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.java
deleted file mode 100644
index aa93cc7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16.d;
-
-public class T_and_int_lit16_2 {
-
- public int run() {
- return 0xfffffff8 & -8;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.d
deleted file mode 100644
index c5f54e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_3.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 0xcafe
- and-int/lit16 v0, v0, -1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.java
deleted file mode 100644
index 93558cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16.d;
-
-public class T_and_int_lit16_3 {
-
- public int run() {
- return 0xcafe & -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.d
deleted file mode 100644
index 7f31097..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_4.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 0
- and-int/lit16 v0, v0, -1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.java
deleted file mode 100644
index 12913cb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16.d;
-
-public class T_and_int_lit16_4 {
-
- public int run() {
- return 0 & -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.d
deleted file mode 100644
index d7c68f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_5.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 32767
- and-int/lit16 v0, v0, -32768
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.java
deleted file mode 100644
index 04e22b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16.d;
-
-public class T_and_int_lit16_5 {
-
- public int run() {
- return Short.MAX_VALUE & Short.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6.d
deleted file mode 100644
index 9c94b7e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_6.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- const-wide v0, 1.0
- and-int/lit16 v0, v0, 1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7.d
deleted file mode 100644
index a272dfa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_7.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- const-wide v0, 1
- and-int/lit16 v0, v0, 1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8.d
deleted file mode 100644
index 614d2b1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_8.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- and-int/lit16 v2, v3, 1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.d
deleted file mode 100644
index 23b9e82..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit16_9.java
-.class public dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
- and-int/lit16 v0, v3, 123
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.java
deleted file mode 100644
index 0af1796..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit16.d;
-
-public class T_and_int_lit16_9 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java
deleted file mode 100644
index 8fb6fbb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_9;
-import dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_1;
-import dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_2;
-import dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_3;
-import dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_4;
-import dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_5;
-
-public class Test_and_int_lit8 extends DxTestCase {
- /**
- * @title Arguments = 15 & 8
- */
- public void testN1() {
- T_and_int_lit8_1 t = new T_and_int_lit8_1();
- assertEquals(8, t.run());
- }
-
- /**
- * @title Arguments = 0xfffffff8 & -8
- */
- public void testN2() {
- T_and_int_lit8_2 t = new T_and_int_lit8_2();
- assertEquals(-8, t.run());
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_and_int_lit8_3 t = new T_and_int_lit8_3();
- assertEquals(0xcafe, t.run());
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float & int) makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_and_int_lit8_9 t = new T_and_int_lit8_9();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_and_int_lit8_4 t = new T_and_int_lit8_4();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = Short.MAX_VALUE & Short.MIN_VALUE
- */
- public void testB2() {
- T_and_int_lit8_5 t = new T_and_int_lit8_5();
- assertEquals(0, t.run());
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.d
deleted file mode 100644
index c357564..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_1.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 15
- and-int/lit8 v0, v0, 8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.java
deleted file mode 100644
index e5972bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8.d;
-
-public class T_and_int_lit8_1 {
-
- public int run() {
- return 15 & 8;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10.d
deleted file mode 100644
index d9a6181..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_10.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- and-int/lit8 v0, v4, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.d
deleted file mode 100644
index 4161d0e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_2.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, -7
- and-int/lit8 v0, v0, -8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.java
deleted file mode 100644
index ed12bb0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8.d;
-
-public class T_and_int_lit8_2 {
-
- public int run() {
- return 0xfffffff8 & -8;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.d
deleted file mode 100644
index 7b5fd5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_3.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 0xcafe
- and-int/lit8 v0, v0, -1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.java
deleted file mode 100644
index 194af5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8.d;
-
-public class T_and_int_lit8_3 {
-
- public int run() {
- return 0xcafe & -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.d
deleted file mode 100644
index 5b2fd88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_4.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 0
- and-int/lit8 v0, v0, -1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.java
deleted file mode 100644
index ac41a53..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8.d;
-
-public class T_and_int_lit8_4 {
-
- public int run() {
- return 0 & -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.d
deleted file mode 100644
index 9634339..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_5.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v0, 127
- and-int/lit8 v0, v0, -128
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.java
deleted file mode 100644
index 7d1e6d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8.d;
-
-public class T_and_int_lit8_5 {
-
- public int run() {
- return Short.MAX_VALUE & Short.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6.d
deleted file mode 100644
index 7e6a548..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_6.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- const-wide v0, 1.0
- and-int/lit8 v0, v0, 1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7.d
deleted file mode 100644
index e09f8bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_7.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- const-wide v0, 1
- and-int/lit8 v0, v0, 1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8.d
deleted file mode 100644
index 78936ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_8.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- and-int/lit8 v2, v3, 1
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.d
deleted file mode 100644
index cb63071..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_int_lit8_9.java
-.class public dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
- and-int/lit8 v0, v3, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.java
deleted file mode 100644
index 27542f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_int_lit8.d;
-
-public class T_and_int_lit8_9 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/Test_and_long.java b/tools/vm-tests/src/dot/junit/opcodes/and_long/Test_and_long.java
deleted file mode 100644
index e2ab252..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/Test_and_long.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.and_long.d.T_and_long_1;
-import dot.junit.opcodes.and_long.d.T_and_long_6;
-
-public class Test_and_long extends DxTestCase {
-
- /**
- * @title Arguments = 0xfffffff8aal, 0xfffffff1aal
- */
- public void testN1() {
- T_and_long_1 t = new T_and_long_1();
- assertEquals(0xfffffff0aal, t.run(0xfffffff8aal, 0xfffffff1aal));
- }
-
- /**
- * @title Arguments = 987654321, 123456789
- */
- public void testN2() {
- T_and_long_1 t = new T_and_long_1();
- assertEquals(39471121, t.run(987654321, 123456789));
- }
-
- /**
- * @title Arguments = 0xABCDEF & -1
- */
- public void testN3() {
- T_and_long_1 t = new T_and_long_1();
- assertEquals(0xABCDEF, t.run(0xABCDEF, -1));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this (long & double) makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_and_long_6 t = new T_and_long_6();
- try {
- t.run(1l, 5d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_and_long_1 t = new T_and_long_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MIN_VALUE
- */
- public void testB2() {
- T_and_long_1 t = new T_and_long_1();
- assertEquals(0, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float & long
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_1.d
deleted file mode 100644
index 9bdc34e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_1.java
-.class public dot.junit.opcodes.and_long.d.T_and_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- and-long v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_1.java
deleted file mode 100644
index 9e2b07b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_long.d;
-
-public class T_and_long_1 {
-
- public long run(long a, long b) {
- return a & b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_2.d
deleted file mode 100644
index 7c9185c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2.java
-.class public dot.junit.opcodes.and_long.d.T_and_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v10, 3.1415
- and-long v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_3.d
deleted file mode 100644
index b68acff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_3.java
-.class public dot.junit.opcodes.and_long.d.T_and_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v10, 12345
- and-long v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_4.d
deleted file mode 100644
index 97a1bcb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_4.java
-.class public dot.junit.opcodes.and_long.d.T_and_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- and-long v0, v9, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_5.d
deleted file mode 100644
index b6948ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_5.java
-.class public dot.junit.opcodes.and_long.d.T_and_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- and-long v0, v10, v14
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_6.d
deleted file mode 100644
index 26ae8a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_6.java
-.class public dot.junit.opcodes.and_long.d.T_and_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 7
-
- and-long v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_6.java b/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_6.java
deleted file mode 100644
index 051a52a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long/d/T_and_long_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_long.d;
-
-public class T_and_long_6 {
-
- public long run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java
deleted file mode 100644
index 34d2fc7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_1;
-import dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_6;
-
-public class Test_and_long_2addr extends DxTestCase {
- /**
- * @title Arguments = 0xfffffff8aal, 0xfffffff1aal
- */
- public void testN1() {
- T_and_long_2addr_1 t = new T_and_long_2addr_1();
- assertEquals(0xfffffff0aal, t.run(0xfffffff8aal, 0xfffffff1aal));
- }
-
- /**
- * @title Arguments = 987654321, 123456789
- */
- public void testN2() {
- T_and_long_2addr_1 t = new T_and_long_2addr_1();
- assertEquals(39471121, t.run(987654321, 123456789));
- }
-
- /**
- * @title Arguments = 0xABCDEF & -1
- */
- public void testN3() {
- T_and_long_2addr_1 t = new T_and_long_2addr_1();
- assertEquals(0xABCDEF, t.run(0xABCDEF, -1));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this (long & double) makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_and_long_2addr_6 t = new T_and_long_2addr_6();
- try {
- t.run(1l, 3.1d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_and_long_2addr_1 t = new T_and_long_2addr_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MIN_VALUE
- */
- public void testB2() {
- T_and_long_2addr_1 t = new T_and_long_2addr_1();
- assertEquals(0, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float & long
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.d
deleted file mode 100644
index aa61af9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2addr_1.java
-.class public dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- and-long/2addr v10, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.java
deleted file mode 100644
index 3b6d259..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_long_2addr.d;
-
-public class T_and_long_2addr_1 {
-
- public long run(long a, long b) {
- return a & b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_2.d
deleted file mode 100644
index e1a4376..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2addr_2.java
-.class public dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v0, 3.1415
- and-long/2addr v0, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3.d
deleted file mode 100644
index ba10fe6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2addr_3.java
-.class public dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v0, 1234
- and-long/2addr v12, v0
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4.d
deleted file mode 100644
index 9882eb3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2addr_4.java
-.class public dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- and-long/2addr v12, v9
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5.d
deleted file mode 100644
index e7bb059..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2addr_5.java
-.class public dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- and-long/2addr v10, v14
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.d
deleted file mode 100644
index b7ee27e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_and_long_2addr_6.java
-.class public dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 7
-
- and-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.java
deleted file mode 100644
index dd6a41d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.and_long_2addr.d;
-
-public class T_and_long_2addr_6 {
-
- public long run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/Test_aput.java b/tools/vm-tests/src/dot/junit/opcodes/aput/Test_aput.java
deleted file mode 100644
index 52ea328..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/Test_aput.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput.d.T_aput_1;
-import dot.junit.opcodes.aput.d.T_aput_8;
-
-public class Test_aput extends DxTestCase {
-
- /**
- * @title put int into array
- */
- public void testN1() {
- T_aput_1 t = new T_aput_1();
- int[] arr = new int[2];
- t.run(arr, 1, 100000000);
- assertEquals(100000000, arr[1]);
- }
-
- /**
- * @title put int into array
- */
- public void testN2() {
- T_aput_1 t = new T_aput_1();
- int[] arr = new int[2];
- t.run(arr, 0, 100000000);
- assertEquals(100000000, arr[0]);
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- int[] arr = new int[2];
- T_aput_8 t = new T_aput_8();
- try {
- t.run(arr, 3.14f, 111f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_1 t = new T_aput_1();
- int[] arr = new int[2];
- try {
- t.run(arr, 2, 100000000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aput_1 t = new T_aput_1();
- try {
- t.run(null, 2, 100000000);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aput_1 t = new T_aput_1();
- int[] arr = new int[2];
- try {
- t.run(arr, -1, 100000000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int, int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, int
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_1.d
deleted file mode 100644
index 0c46208..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_1.java
-.class public dot.junit.opcodes.aput.d.T_aput_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([III)V
-.limit regs 11
-
- aput v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_1.java
deleted file mode 100644
index d9c47a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput.d;
-
-public class T_aput_1 {
- public void run(int[] arr, int idx, int value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_2.d
deleted file mode 100644
index 7ef7585..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_2.java
-.class public dot.junit.opcodes.aput.d.T_aput_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([IDI)V
-.limit regs 11
-
-
- aput v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_3.d
deleted file mode 100644
index f2872a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_3.java
-.class public dot.junit.opcodes.aput.d.T_aput_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([IIJ)V
-.limit regs 11
-
-
- aput v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_4.d
deleted file mode 100644
index 6070220..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_4.java
-.class public dot.junit.opcodes.aput.d.T_aput_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;II)V
-.limit regs 10
-
-
- aput v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_5.d
deleted file mode 100644
index 9a37f62..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_5.java
-.class public dot.junit.opcodes.aput.d.T_aput_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DII)V
-.limit regs 10
-
-
- aput v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_6.d
deleted file mode 100644
index 82dc6ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_6.java
-.class public dot.junit.opcodes.aput.d.T_aput_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JII)V
-.limit regs 10
-
-
- aput v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_7.d
deleted file mode 100644
index 66017e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_7.java
-.class public dot.junit.opcodes.aput.d.T_aput_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([III)V
-.limit regs 10
-
- aput v9, v7, v6
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_8.d
deleted file mode 100644
index 1f56222..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_8.java
-.class public dot.junit.opcodes.aput.d.T_aput_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([IFF)V
-.limit regs 11
-
- aput v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_8.java b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_8.java
deleted file mode 100644
index 87c6e5c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput.d;
-
-public class T_aput_8 {
- public void run(int[] arr, float idx, float value) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_9.d
deleted file mode 100644
index 73c5932..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput/d/T_aput_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_9.java
-.class public dot.junit.opcodes.aput.d.T_aput_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([III)V
-.limit regs 11
-
- aput v11, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
deleted file mode 100644
index 0ab9d04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_boolean;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput_boolean.d.T_aput_boolean_1;
-import dot.junit.opcodes.aput_boolean.d.T_aput_boolean_8;
-
-public class Test_aput_boolean extends DxTestCase {
- /**
- * @title put boolean into array
- */
- public void testN1() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- boolean[] arr = new boolean[2];
- t.run(arr, 1, true);
- assertEquals(true, arr[1]);
- }
-
- /**
- * @title put boolean into array
- */
- public void testN2() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- boolean[] arr = new boolean[2];
- t.run(arr, 0, true);
- assertEquals(true, arr[0]);
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- boolean[] arr = new boolean[2];
- T_aput_boolean_8 t = new T_aput_boolean_8();
- try {
- t.run(arr, 3.14f, true);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, 2, true);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- try {
- t.run(null, 2, true);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, -1, true);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int, int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, int
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B15
- * @title put value 2 into boolean array
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.d
deleted file mode 100644
index 0d97f3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_1.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZIZ)V
-.limit regs 11
-
- aput-boolean v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.java
deleted file mode 100644
index 15a0fcf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_boolean.d;
-
-public class T_aput_boolean_1 {
- public void run(boolean[] arr, int idx, boolean value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_10.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_10.d
deleted file mode 100644
index 64eb60e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_10.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZIZ)V
-.limit regs 11
-
- const v10, 2
- aput-boolean v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_2.d
deleted file mode 100644
index 2f73747..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_2.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZDZ)V
-.limit regs 11
-
-
- aput-boolean v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_3.d
deleted file mode 100644
index 9eae917..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_3.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZIJ)V
-.limit regs 11
-
-
- aput-boolean v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_4.d
deleted file mode 100644
index 54f5a19..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_4.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;IZ)V
-.limit regs 10
-
-
- aput-boolean v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_5.d
deleted file mode 100644
index ecaf950..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_5.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DIZ)V
-.limit regs 10
-
-
- aput-boolean v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_6.d
deleted file mode 100644
index db2bf25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_6.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIZ)V
-.limit regs 10
-
-
- aput-boolean v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_7.d
deleted file mode 100644
index 7e9ed2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_7.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZIZ)V
-.limit regs 10
-
- aput-boolean v9, v7, v6
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.d
deleted file mode 100644
index bf92b91..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_8.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZFZ)V
-.limit regs 11
-
- aput-boolean v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.java b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.java
deleted file mode 100644
index 09606e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_boolean.d;
-
-public class T_aput_boolean_8 {
- public void run(boolean[] arr, float idx, boolean value) {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_9.d
deleted file mode 100644
index e42fd3a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_boolean_9.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZIZ)V
-.limit regs 11
-
- aput-boolean v11, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
deleted file mode 100644
index 3c43916..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput_byte.d.T_aput_byte_1;
-import dot.junit.opcodes.aput_byte.d.T_aput_byte_8;
-
-public class Test_aput_byte extends DxTestCase {
- /**
- * @title put byte into array
- */
- public void testN1() {
- T_aput_byte_1 t = new T_aput_byte_1();
- byte[] arr = new byte[2];
- t.run(arr, 1, (byte) 100);
- assertEquals(100, arr[1]);
- }
-
- /**
- * @title put byte into array
- */
- public void testN2() {
- T_aput_byte_1 t = new T_aput_byte_1();
- byte[] arr = new byte[2];
- t.run(arr, 0, (byte) 100);
- assertEquals(100, arr[0]);
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- byte[] arr = new byte[2];
- T_aput_byte_8 t = new T_aput_byte_8();
- try {
- t.run(arr, 3.14f, (byte)1);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_byte_1 t = new T_aput_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, 2, (byte) 100);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aput_byte_1 t = new T_aput_byte_1();
- try {
- t.run(null, 2, (byte) 100);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aput_byte_1 t = new T_aput_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, -1, (byte) 100);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, short
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, short
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int, short
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int, short
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, short
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B15
- * @title put value 128 into byte array
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.d
deleted file mode 100644
index 097ae50..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_1.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BIB)V
-.limit regs 11
-
- aput-byte v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.java
deleted file mode 100644
index 57561be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_byte.d;
-
-public class T_aput_byte_1 {
- public void run(byte[] arr, int idx, byte value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_10.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_10.d
deleted file mode 100644
index b65ae76..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_10.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BIB)V
-.limit regs 11
-
- const v10, 128
- aput-byte v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_2.d
deleted file mode 100644
index 55f781e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_2.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BDB)V
-.limit regs 11
-
-
- aput-byte v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_3.d
deleted file mode 100644
index 5684437..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_3.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BIJ)V
-.limit regs 11
-
-
- aput-byte v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_4.d
deleted file mode 100644
index 06e4eff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_4.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;IB)V
-.limit regs 10
-
-
- aput-byte v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_5.d
deleted file mode 100644
index 2835e5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_5.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DIB)V
-.limit regs 10
-
-
- aput-byte v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_6.d
deleted file mode 100644
index 66da57c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_6.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIB)V
-.limit regs 10
-
-
- aput-byte v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_7.d
deleted file mode 100644
index 4fb862b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_7.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BIB)V
-.limit regs 10
-
- aput-byte v9, v7, v6
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.d
deleted file mode 100644
index 0c4914e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_8.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BFB)V
-.limit regs 11
-
- aput-byte v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.java b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.java
deleted file mode 100644
index 00f9d64..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_byte.d;
-
-public class T_aput_byte_8 {
- public void run(byte[] arr, float idx, byte value) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_9.d
deleted file mode 100644
index e644e87..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_byte_9.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BIB)V
-.limit regs 11
-
- aput-byte v11, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/Test_aput_char.java b/tools/vm-tests/src/dot/junit/opcodes/aput_char/Test_aput_char.java
deleted file mode 100644
index 4253346..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/Test_aput_char.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput_char.d.T_aput_char_1;
-import dot.junit.opcodes.aput_char.d.T_aput_char_8;
-
-
-public class Test_aput_char extends DxTestCase {
- /**
- * @title put char into array
- */
- public void testN1() {
- T_aput_char_1 t = new T_aput_char_1();
- char[] arr = new char[2];
- t.run(arr, 1, 'g');
- assertEquals('g', arr[1]);
- }
-
- /**
- * @title put char into array
- */
- public void testN2() {
- T_aput_char_1 t = new T_aput_char_1();
- char[] arr = new char[2];
- t.run(arr, 0, 'g');
- assertEquals('g', arr[0]);
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- char[] arr = new char[2];
- T_aput_char_8 t = new T_aput_char_8();
- try {
- t.run(arr, 3.14f, 'g');
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_char_1 t = new T_aput_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, 2, 'g');
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aput_char_1 t = new T_aput_char_1();
- try {
- t.run(null, 2, 'g');
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aput_char_1 t = new T_aput_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, -1, 'g');
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, char
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, char
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int, char
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int, char
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, char
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B15
- * @title put value 65536 into char array
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.d
deleted file mode 100644
index 409eade..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_1.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CIC)V
-.limit regs 11
-
- aput-char v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.java
deleted file mode 100644
index 65f4cd3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_char.d;
-
-public class T_aput_char_1 {
- public void run(char[] arr, int idx, char value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_10.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_10.d
deleted file mode 100644
index dd68792..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_10.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CIC)V
-.limit regs 11
-
- const v10, 65536
- aput-char v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_2.d
deleted file mode 100644
index 0408006..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_2.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CDC)V
-.limit regs 11
-
-
- aput-char v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_3.d
deleted file mode 100644
index 5010da6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_3.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CIJ)V
-.limit regs 11
-
-
- aput-char v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_4.d
deleted file mode 100644
index 67d67ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_4.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;IC)V
-.limit regs 10
-
-
- aput-char v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_5.d
deleted file mode 100644
index cd0384a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_5.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DIC)V
-.limit regs 10
-
-
- aput-char v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_6.d
deleted file mode 100644
index 2a2381d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_6.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIC)V
-.limit regs 10
-
-
- aput-char v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_7.d
deleted file mode 100644
index b1e4c9f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_7.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CIC)V
-.limit regs 10
-
- aput-char v9, v7, v6
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.d
deleted file mode 100644
index f78376d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_8.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CFC)V
-.limit regs 11
-
- aput-char v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.java b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.java
deleted file mode 100644
index ea02ba1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_char.d;
-
-public class T_aput_char_8 {
- public void run(char[] arr, float idx, char value) {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_9.d
deleted file mode 100644
index 1077039..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_char/d/T_aput_char_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_char_9.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CIC)V
-.limit regs 11
-
- aput-char v11, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/Test_aput_object.java b/tools/vm-tests/src/dot/junit/opcodes/aput_object/Test_aput_object.java
deleted file mode 100644
index cb50224..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/Test_aput_object.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput_object.d.T_aput_object_1;
-import dot.junit.opcodes.aput_object.d.T_aput_object_12;
-import dot.junit.opcodes.aput_object.d.T_aput_object_2;
-import dot.junit.opcodes.aput_object.d.T_aput_object_3;
-import dot.junit.opcodes.aput_object.d.T_aput_object_4;
-
-public class Test_aput_object extends DxTestCase {
- /**
- * @title put reference into array
- */
- public void testN1() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = new String[2];
- t.run(arr, 0, "hello");
- assertEquals("hello", arr[0]);
- }
-
- /**
- * @title put reference into array
- */
- public void testN2() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] value = {"world", null, ""};
- String[] arr = new String[2];
- for (int i = 0; i < value.length; i++) {
- t.run(arr, 1, value[i]);
- assertEquals(value[i], arr[1]);
- }
- }
-
- /**
- * @title put reference into array
- */
- public void testN3() {
- T_aput_object_2 t = new T_aput_object_2();
- Integer[] arr = new Integer[2];
- Integer value = new Integer(12345);
- t.run(arr, 0, value);
- assertEquals(value, arr[0]);
- }
-
- /**
- * @title Check assignement compatibility rules
- */
- public void testN4() {
- T_aput_object_3 t = new T_aput_object_3();
- assertEquals(3, t.run());
-
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
- public void testN5() {
- String[] arr = new String[2];
- T_aput_object_12 t = new T_aput_object_12();
- try {
- t.run(arr, 3.14f, new String());
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = new String[2];
- try {
- t.run(arr, arr.length, "abc");
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE2() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = new String[2];
- try {
- t.run(arr, -1, "abc");
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE3() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = null;
- try {
- t.run(arr, 0, "abc");
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayStoreException
- */
- public void testE4() {
- T_aput_object_4 t = new T_aput_object_4();
- String[] arr = new String[2];
- try {
- t.run(arr, 0, t);
- fail("expected ArrayStoreException");
- } catch (ArrayStoreException aie) {
- // expected
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, String
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, String
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float[], int, String
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int, String
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, String
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B15
- * @title put integer into array of references
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.d
deleted file mode 100644
index c629f3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_1.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-.limit regs 11
-
- aput-object v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.java
deleted file mode 100644
index 1361e82..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_object.d;
-
-public class T_aput_object_1 {
-
- public void run(String[] arr, int idx, String value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_10.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_10.d
deleted file mode 100644
index a11e1ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_10.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_10.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-.limit regs 10
-
- aput-object v9, v7, v6
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_11.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_11.d
deleted file mode 100644
index 1b4f7ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_11.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_11.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-.limit regs 11
-
- aput-object v11, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.d
deleted file mode 100644
index 35160aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_12.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;FLjava/lang/String;)V
-.limit regs 11
-
- aput-object v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.java b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.java
deleted file mode 100644
index f55edbb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_object.d;
-
-public class T_aput_object_12 {
-
- public void run(String[] arr, float idx, String value) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_13.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_13.d
deleted file mode 100644
index f9670ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_13.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_13.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-.limit regs 11
-
- const v10, 1
- aput-object v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.d
deleted file mode 100644
index 4e1cad0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_2.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/Integer;ILjava/lang/Integer;)V
-.limit regs 11
-
- aput-object v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.java b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.java
deleted file mode 100644
index 4b2204e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_object.d;
-
-public class T_aput_object_2 {
-
- public void run(Integer[] arr, int idx, Integer value) {
- arr[idx] = value;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_3.d
deleted file mode 100644
index 4b2642d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_3.d
+++ /dev/null
@@ -1,132 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestStubs.java
-.interface abstract dot.junit.opcodes.aput_object.d.SuperInterface
-
-.source TestStubs.java
-.interface public dot.junit.opcodes.aput_object.d.SuperInterface2
-
-.source TestStubs.java
-.class public dot.junit.opcodes.aput_object.d.SuperClass
-.super java/lang/Object
-.implements dot.junit.opcodes.aput_object.d.SuperInterface
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.source TestStubs.java
-.class public dot.junit.opcodes.aput_object.d.SubClass
-.super dot.junit.opcodes.aput_object.d.SuperClass
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/aput_object/d/SuperClass/<init>()V
- return-void
-.end method
-
-
-.source T_aput_object_3.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 32
-
- const v1, 0
-
- const v0, 1
- ; v2 = SubClass[]
- new-array v2, v0, [Ldot/junit/opcodes/aput_object/d/SubClass;
-
- ; v3 = SuperClass[]
- new-array v3, v0, [Ldot/junit/opcodes/aput_object/d/SuperClass;
-
- ; v4 = SubClass
- new-instance v4, dot/junit/opcodes/aput_object/d/SubClass
- invoke-direct {v4}, dot/junit/opcodes/aput_object/d/SubClass/<init>()V
-
- ; v5 = SuperClass
- new-instance v5, dot/junit/opcodes/aput_object/d/SuperClass
- invoke-direct {v5}, dot/junit/opcodes/aput_object/d/SuperClass/<init>()V
-
- ; v6 = SuperInterface[]
- new-array v6, v0, [Ldot/junit/opcodes/aput_object/d/SuperInterface;
-
- ; v7 = Object[]
- new-array v7, v0, [Ljava/lang/Object;
-
- ; v8 = SuperInterface2[]
- new-array v8, v0, [Ldot/junit/opcodes/aput_object/d/SuperInterface2;
-
- const/4 v0, 0
-
-; (SubClass -> SuperClass[])
- aput-object v4, v3, v0
-
-; (SubClass -> SuperInterface[])
- aput-object v4, v6, v0
-
-; (SubClass -> Object[])
- aput-object v4, v7, v0
-
-; !(SuperClass -> SubClass[])
-Label10:
- aput-object v5, v2, v0
-Label11:
- goto Label2
-Label12:
- add-int/lit8 v1, v1, 1
- goto Label2
-
-; !(SuperClass -> SuperInterface2[])
-Label2:
-Label20:
- aput-object v5, v8, v0
-Label21:
- goto Label3
-Label22:
- add-int/lit8 v1, v1, 1
- goto Label3
-
-; !(SubClass[] -> SuperInterface[])
-Label3:
-Label30:
- aput-object v2, v6, v0
-Label31:
- goto Label4
-Label32:
- add-int/lit8 v1, v1, 1
- goto Label4
-
-Label4:
- return v1
-
-.catch java/lang/ArrayStoreException from Label10 to Label11 using Label12
-.catch java/lang/ArrayStoreException from Label20 to Label21 using Label22
-.catch java/lang/ArrayStoreException from Label30 to Label31 using Label32
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_3.java b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_3.java
deleted file mode 100644
index 1a90fd1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_object.d;
-
-public class T_aput_object_3 {
-
- public int run() {
- return 3;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.d
deleted file mode 100644
index f79b817..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_4.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/Object;)V
-.limit regs 11
- aput-object v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.java b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.java
deleted file mode 100644
index 52e935b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_object.d;
-
-public class T_aput_object_4 {
-
-// public void run(Integer[] arr, int idx) {
- /* similar to
- * Object x[] = new String[3];
- * x[0] = new Integer(0);
- */
-// }
-
- public void run(String[] arr, int idx, Object a) {
- //arr[idx] = a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_5.d
deleted file mode 100644
index 441ac56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_5.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;DLjava/lang/String;)V
-.limit regs 11
-
- aput-object v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_6.d
deleted file mode 100644
index 5786bbb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_6.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/String;IJ)V
-.limit regs 11
-
- aput-object v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_7.d
deleted file mode 100644
index dfdc953..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_7.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;ILjava/lang/String;)V
-.limit regs 11
-
- aput-object v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_8.d
deleted file mode 100644
index e6259bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_8.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([FILjava/lang/String;)V
-.limit regs 10
-
- aput-object v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_9.d
deleted file mode 100644
index 96bced3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_object/d/T_aput_object_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_object_9.java
-.class public dot.junit.opcodes.aput_object.d.T_aput_object_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JILjava/lang/String;)V
-.limit regs 10
-
- aput-object v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/Test_aput_short.java b/tools/vm-tests/src/dot/junit/opcodes/aput_short/Test_aput_short.java
deleted file mode 100644
index 350d999..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/Test_aput_short.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput_short.d.T_aput_short_1;
-import dot.junit.opcodes.aput_short.d.T_aput_short_8;
-
-public class Test_aput_short extends DxTestCase {
- /**
- * @title put short into array
- */
- public void testN1() {
- T_aput_short_1 t = new T_aput_short_1();
- short[] arr = new short[2];
- t.run(arr, 1, (short) 10000);
- assertEquals(10000, arr[1]);
- }
-
- /**
- * @title put short into array
- */
- public void testN2() {
- T_aput_short_1 t = new T_aput_short_1();
- short[] arr = new short[2];
- t.run(arr, 0, (short) 10000);
- assertEquals(10000, arr[0]);
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
-
- public void testN3() {
- short[] arr = new short[2];
- T_aput_short_8 t = new T_aput_short_8();
- try {
- t.run(arr, 3.14f, (short)111);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_short_1 t = new T_aput_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, 2, (short) 10000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aput_short_1 t = new T_aput_short_1();
- try {
- t.run(null, 2, (short) 10000);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aput_short_1 t = new T_aput_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, -1, (short) 10000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double[], int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long[], int, int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, int
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B15
- * @title put value 32768 into array of shorts
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.d
deleted file mode 100644
index f89cbb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_1.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SIS)V
-.limit regs 11
-
- aput-short v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.java
deleted file mode 100644
index 42cefa9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_short.d;
-
-public class T_aput_short_1 {
- public void run(short[] arr, int idx, short value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_10.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_10.d
deleted file mode 100644
index bbb541c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_10.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SIS)V
-.limit regs 11
-
- const v10, 32768
- aput-short v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_2.d
deleted file mode 100644
index 9d63757..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_2.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SDS)V
-.limit regs 11
-
-
- aput-short v10, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_3.d
deleted file mode 100644
index c9990b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_3.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SIJ)V
-.limit regs 11
-
-
- aput-short v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_4.d
deleted file mode 100644
index 24b2d92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_4.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;IS)V
-.limit regs 10
-
-
- aput-short v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_5.d
deleted file mode 100644
index 4a9dabc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_5.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DIS)V
-.limit regs 10
-
-
- aput-short v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_6.d
deleted file mode 100644
index ed8cfd3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_6.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIS)V
-.limit regs 10
-
-
- aput-short v9, v7, v8
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_7.d
deleted file mode 100644
index 9927025..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_7.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SIS)V
-.limit regs 10
-
- aput-short v9, v7, v6
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.d
deleted file mode 100644
index 099de06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_8.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SFS)V
-.limit regs 11
-
- aput-short v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.java b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.java
deleted file mode 100644
index e973865..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_short.d;
-
-public class T_aput_short_8 {
- public void run(short[] arr, float idx, short value) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_9.d
deleted file mode 100644
index 46efab3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_short/d/T_aput_short_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_short_9.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SIS)V
-.limit regs 11
-
- aput-short v11, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java
deleted file mode 100644
index 4b7f0ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.aput_wide.d.T_aput_wide_1;
-import dot.junit.opcodes.aput_wide.d.T_aput_wide_2;
-import dot.junit.opcodes.aput_wide.d.T_aput_wide_6;
-import dot.junit.opcodes.aput_wide.d.T_aput_wide_9;
-
-
-public class Test_aput_wide extends DxTestCase {
- /**
- * @title put long into array
- */
- public void testN1() {
- T_aput_wide_1 t = new T_aput_wide_1();
- long[] arr = new long[2];
- t.run(arr, 1, 100000000000l);
- assertEquals(100000000000l, arr[1]);
- }
-
- /**
- * @title put long into array
- */
- public void testN2() {
- T_aput_wide_1 t = new T_aput_wide_1();
- long[] arr = new long[2];
- t.run(arr, 0, 100000000000l);
- assertEquals(100000000000l, arr[0]);
- }
-
- /**
- * @title put double into array
- */
- public void testN3() {
- T_aput_wide_2 t = new T_aput_wide_2();
- double[] arr = new double[2];
- t.run(arr, 0, 3.1415d);
- assertEquals(3.1415d, arr[0]);
- }
-
- /**
- * @title Type of index argument - float. Dalvik doens't distinguish 64-bits types internally,
- * so this array[float]=value makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- long[] arr = new long[2];
- T_aput_wide_9 t = new T_aput_wide_9();
- try {
- t.run(arr, 3.14f, 111);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Try to put long into double[]. Dalvik doens't distinguish 64-bits types internally,
- * so this operation makes no sense but shall not crash the VM.
- */
- public void testN5() {
- double[] arr = new double[2];
- T_aput_wide_6 t = new T_aput_wide_6();
- try {
- t.run(arr, 0, 1234l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE1() {
- T_aput_wide_1 t = new T_aput_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, 2, 100000000000l);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_aput_wide_1 t = new T_aput_wide_1();
- try {
- t.run(null, 1, 100000000000l);
- fail("expected NullPointerException");
- } catch (NullPointerException np) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException (negative index)
- */
- public void testE3() {
- T_aput_wide_1 t = new T_aput_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, -1, 100000000000l);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - array, double, long
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, int, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - object, int, long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int[], int, long
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - array, reference, long
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.d
deleted file mode 100644
index 2890417..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_1.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIJ)V
-.limit regs 14
-
- aput-wide v12, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.java
deleted file mode 100644
index 385db2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_wide.d;
-
-public class T_aput_wide_1 {
-
- public void run(long[] arr, int idx, long value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_10.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_10.d
deleted file mode 100644
index bf314a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_10.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIJ)V
-.limit regs 14
-
- aput-wide v14, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.d
deleted file mode 100644
index 793338f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_2.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DID)V
-.limit regs 14
-
- aput-wide v12, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.java b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.java
deleted file mode 100644
index e333794..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_wide.d;
-
-public class T_aput_wide_2 {
-
- public void run(double[] arr, int idx, double value) {
- arr[idx] = value;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_3.d
deleted file mode 100644
index 4486392..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_3.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JDJ)V
-.limit regs 14
-
- aput-wide v12, v9, v10
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_4.d
deleted file mode 100644
index 980724f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_4.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JII)V
-.limit regs 14
-
- aput-wide v13, v11, v12
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_5.d
deleted file mode 100644
index f4d3354..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_5.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;IJ)V
-.limit regs 14
-
- aput-wide v12, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.d
deleted file mode 100644
index e5f58d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_6.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([DIJ)V
-.limit regs 14
-
- aput-wide v12, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.java b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.java
deleted file mode 100644
index d1466a3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_wide.d;
-
-public class T_aput_wide_6 {
-
- public void run(double[] arr, int idx, long value) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_7.d
deleted file mode 100644
index c862b0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_7.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([IIJ)V
-.limit regs 14
-
- aput-wide v12, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_8.d
deleted file mode 100644
index 06e1aa0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_8.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JIJ)V
-.limit regs 14
-
- aput-wide v12, v10, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.d b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.d
deleted file mode 100644
index 41777df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aput_wide_9.java
-.class public dot.junit.opcodes.aput_wide.d.T_aput_wide_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([JFJ)V
-.limit regs 14
-
- aput-wide v12, v10, v11
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.java b/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.java
deleted file mode 100644
index c08f9be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.aput_wide.d;
-
-public class T_aput_wide_9 {
-
- public void run(long[] arr, float idx, long value) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/Test_array_length.java b/tools/vm-tests/src/dot/junit/opcodes/array_length/Test_array_length.java
deleted file mode 100644
index f49cccb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/Test_array_length.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.array_length;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.array_length.d.T_array_length_1;
-import dot.junit.opcodes.array_length.d.T_array_length_4;
-
-
-public class Test_array_length extends DxTestCase {
- /**
- * @title get length of array of references
- */
- public void testN1() {
- T_array_length_1 t = new T_array_length_1();
- String[] a = new String[5];
- assertEquals(5, t.run(a));
- }
-
- /**
- * @title get length of array of doubles
- */
- public void testN2() {
- T_array_length_4 t = new T_array_length_4();
- double[] a = new double[10];
- assertEquals(10, t.run(a));
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testNPE1() {
- T_array_length_1 t = new T_array_length_1();
- try {
- t.run(null);
- fail("NPE expected");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - Object
- */
- public void testVFE1() {
- try {
- Class.forName("dxc.junit.opcodes.array_length.jm.T_array_length_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int
- */
- public void testVFE2() {
- try {
- Class.forName("dxc.junit.opcodes.array_length.jm.T_array_length_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dxc.junit.opcodes.array_length.jm.T_array_length_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_1.d b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_1.d
deleted file mode 100644
index 3981009..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_array_length_1.java
-.class public dot.junit.opcodes.array_length.d.T_array_length_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/Object;)I
-.limit regs 5
-
- array-length v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_1.java b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_1.java
deleted file mode 100644
index fd30072..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.array_length.d;
-
-public class T_array_length_1 {
-
- public int run(Object[] arr) {
- return arr.length;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_2.d b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_2.d
deleted file mode 100644
index b1b015c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_array_length_2.java
-.class public dot.junit.opcodes.array_length.d.T_array_length_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)I
-.limit regs 5
-
- array-length v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_3.d b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_3.d
deleted file mode 100644
index 01bdaf0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_array_length_3.java
-.class public dot.junit.opcodes.array_length.d.T_array_length_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)I
-.limit regs 5
-
- const v4, 1234
- array-length v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_4.d b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_4.d
deleted file mode 100644
index af48dfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_array_length_4.java
-.class public dot.junit.opcodes.array_length.d.T_array_length_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([D)I
-.limit regs 5
-
- array-length v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_4.java b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_4.java
deleted file mode 100644
index b3fa51f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.array_length.d;
-
-public class T_array_length_4 {
-
- public int run(double[] arr) {
- return arr.length;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_5.d b/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_5.d
deleted file mode 100644
index c7b1f9e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/array_length/d/T_array_length_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_array_length_5.java
-.class public dot.junit.opcodes.array_length.d.T_array_length_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/Object;)V
-.limit regs 5
-
- array-length v5, v4
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/check_cast/TestStubs.java
deleted file mode 100644
index 67f8f04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/TestStubs.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.check_cast;
-
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/Test_check_cast.java b/tools/vm-tests/src/dot/junit/opcodes/check_cast/Test_check_cast.java
deleted file mode 100644
index 78a0479..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/Test_check_cast.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.check_cast;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.check_cast.d.T_check_cast_1;
-import dot.junit.opcodes.check_cast.d.T_check_cast_2;
-import dot.junit.opcodes.check_cast.d.T_check_cast_3;
-import dot.junit.opcodes.check_cast.d.T_check_cast_7;
-
-
-public class Test_check_cast extends DxTestCase {
-
-
- /**
- * @title (String)(Object)String
- */
- public void testN1() {
- T_check_cast_1 t = new T_check_cast_1();
- String s = "";
- assertEquals(s, t.run(s));
- }
-
- /**
- * @title (String)(Object)null
- */
- public void testN2() {
- T_check_cast_1 t = new T_check_cast_1();
- assertNull(t.run(null));
- }
-
- /**
- * @title check assignment compatibility rules
- */
- public void testN4() {
- T_check_cast_2 t = new T_check_cast_2();
- assertEquals(5, t.run());
- }
-
- /**
- * @title expected ClassCastException
- */
- public void testE1() {
- T_check_cast_1 t = new T_check_cast_1();
- try {
- t.run(t);
- fail("expected ClassCastException");
- } catch (ClassCastException iae) {
- // expected
- }
- }
-
- /**
- * @constraint A18
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to access inaccessible class, expect throws IllegalAccessError
- */
- public void testVFE5() {
- //@uses dot.junit.opcodes.check_cast.TestStubs
- //@uses dot.junit.opcodes.check_cast.d.T_check_cast_3
- T_check_cast_3 t = new T_check_cast_3();
- try {
- t.run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError iae) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to access undefined class, expect throws NoClassDefFoundError on
- * first access
- */
- public void testVFE6() {
- T_check_cast_7 t = new T_check_cast_7();
- try {
- t.run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError iae) {
- // expected
- }
- }
-
- /**
- * @constraint A18
- * @title constant pool type
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.d
deleted file mode 100644
index 9c2f074..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_1.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-.limit regs 5
-
- check-cast v4, java/lang/String
- return-object v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.java b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.java
deleted file mode 100644
index 4387def..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.check_cast.d;
-
-public class T_check_cast_1 {
-
- public String run(Object o) {
- return (String)o;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_2.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_2.d
deleted file mode 100644
index b7472cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_2.d
+++ /dev/null
@@ -1,149 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestStubs.java
-.interface public dot.junit.opcodes.check_cast.d.T_check_cast_2.SuperInterface
-
-.source TestStubs.java
-.interface public dot.junit.opcodes.check_cast.d.T_check_cast_2.SuperInterface2
-
-.source TestStubs.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_2.SuperClass
-.super java/lang/Object
-.implements dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperInterface
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.source TestStubs.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_2.SubClass
-.super dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass/<init>()V
- return-void
-.end method
-
-
-.source T_check_cast_2.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 20
-
- const v1, 0
-
-; (SubClass instanceof SuperClass)
- new-instance v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass
- invoke-direct {v10}, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass/<init>()V
- check-cast v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass
-
-; (SubClass[] instanceof SuperClass[])
- const v11, 1
- new-array v10, v11, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass;
- check-cast v10, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass;
-
-
-; (SubClass[] instanceof Object)
- new-array v10, v11, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass;
- check-cast v10, java/lang/Object
-
-; (SubClass instanceof SuperInterface)
- new-instance v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass
- invoke-direct {v10}, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass/<init>()V
- check-cast v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperInterface
-
-
-; !(SuperClass instanceof SubClass)
-Label1:
- new-instance v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass
- invoke-direct {v10}, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass/<init>()V
-Label10:
- check-cast v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass
-Label11:
- goto Label2
-Label12:
- add-int/lit16 v1, v1, 1
- goto Label2
-
-; !(SubClass instanceof SuperInterface2)
-Label2:
- new-instance v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass
- invoke-direct {v10}, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass/<init>()V
-Label20:
- check-cast v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperInterface2
-Label21:
- goto Label3
-Label22:
- add-int/lit16 v1, v1, 1
- goto Label3
-
-; !(SubClass[] instanceof SuperInterface)
-Label3:
- new-array v10, v11, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass;
-Label30:
- check-cast v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SuperInterface
-Label31:
- goto Label4
-Label32:
- add-int/lit16 v1, v1, 1
- goto Label4
-
-; !(SubClass[] instanceof SubClass)
-Label4:
- new-array v10, v11, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass;
-Label40:
- check-cast v10, dot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass
-Label41:
- goto Label5
-Label42:
- add-int/lit16 v1, v1, 1
- goto Label5
-
-; !(SuperClass[] instanceof SubClass[])
-Label5:
- new-array v10, v11, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SuperClass;
-Label50:
- check-cast v10, [Ldot/junit/opcodes/check_cast/d/T_check_cast_2/SubClass;
-Label51:
- goto Label6
-Label52:
- add-int/lit16 v1, v1, 1
-
-Label6:
- return v1
-
-.catch java/lang/ClassCastException from Label10 to Label11 using Label12
-.catch java/lang/ClassCastException from Label20 to Label21 using Label22
-.catch java/lang/ClassCastException from Label30 to Label31 using Label32
-.catch java/lang/ClassCastException from Label40 to Label41 using Label42
-.catch java/lang/ClassCastException from Label50 to Label51 using Label52
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_2.java b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_2.java
deleted file mode 100644
index 5e55188..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.check_cast.d;
-
-public class T_check_cast_2 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.d
deleted file mode 100644
index d269a31..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_3.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
- check-cast v5, dot/junit/opcodes/check_cast/TestStubs
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.java b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.java
deleted file mode 100644
index 4c4f153..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.check_cast.d;
-
-public class T_check_cast_3 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.d
deleted file mode 100644
index 77e28d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_4.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-.limit regs 5
-
- check-cast v4, java/lang/String
- return-object v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.dfh
deleted file mode 100644
index ed092c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.dfh
+++ /dev/null
@@ -1,264 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/check_cast/d/T_check_cast_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/check_cast/d/T_check_cast_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 1f0a4ad6
- D6 4A 0A 1F
-// parsed: offset 12, len 20: signature : c885...5be2
- C8 85 20 53 64 78 EF B4 92 49 06 A9 EC FA 7E 44 D0 A3 5B E2
-// parsed: offset 32, len 4: file_size : 576
- 40 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 440 (0x0001b8)
- B8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 336
- 50 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "LL"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 306 (0x000132) "Ldot/junit/opcodes/check_cast/d/T_check_cast_4;"
- 32 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 355 (0x000163) "Ljava/lang/Object;"
- 63 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 375 (0x000177) "Ljava/lang/String;"
- 77 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "T_check_cast_4.java"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 416 (0x0001a0) "V"
- A0 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 419 (0x0001a3) "run"
- A3 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/check_cast/d/T_check_cast_4;"
- 02 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/String;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "LL"
-// return_type_idx: 2 (0x000002) "Ljava/lang/String;"
-// parameters_off: 288 (0x000120)
- 01 00 00 00 02 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/check_cast/d/T_check_cast_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_check_cast_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 424 (0x0001a8)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 A8 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.check_cast.d.T_check_cast_4.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.check_cast.d.T_check_cast_4.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: check-cast v4, Ljava/lang/String; // class@0002
-//@mod 1F 04 02 00
- 1F 04 02 01
- // parsed: offset 284, len 2: |0002: return-object v4
- 11 04
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 1
- 01 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 4: TYPE_STRING_DATA_ITEM [1] "LL"
- 02 4C 4C 00
-// parsed: offset 306, len 49: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/check_cast/d/T_check_cast_4;"
- 2F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 63 68 65 63 6B 5F 63 61 73 74 2F 64 2F 54 5F 63 68 65 63 6B 5F 63 61 73 74 5F 34 3B 00
-// parsed: offset 355, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 375, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 395, len 21: TYPE_STRING_DATA_ITEM [5] "T_check_cast_4.java"
- 13 54 5F 63 68 65 63 6B 5F 63 61 73 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 416, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 419, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/check_cast/d/T_check_cast_4;"
- // parsed: offset 424, len 1: static_fields_size: 0
- 00
- // parsed: offset 425, len 1: instance_fields_size: 0
- 00
- // parsed: offset 426, len 1: direct_methods_size: 1
- 01
- // parsed: offset 427, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 428, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 429, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 432, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 434, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 435, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 436, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 438, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 440, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 444, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 456, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 468, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 480, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 492, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 504, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 516, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 528, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 540, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 552, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 20 00 00 01 00 00 00 A8 01 00 00
- // parsed: offset 564, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 440 (0x0001b8)
- 00 10 00 00 01 00 00 00 B8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_5.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_5.d
deleted file mode 100644
index b76a68e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_5.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
- const v3, 1234
- check-cast v3, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_6.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_6.d
deleted file mode 100644
index 7e26639..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_6.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
-
- check-cast v5, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.d
deleted file mode 100644
index 8c7af68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_7.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- check-cast v5, dot/junit/opcodes/check_cast/Test_check_castN
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.java b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.java
deleted file mode 100644
index fa941a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.check_cast.d;
-
-public class T_check_cast_7 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_8.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_8.d
deleted file mode 100644
index 645436f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_8.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
- const-wide v0, 1234
- check-cast v0, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.d b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.d
deleted file mode 100644
index e44cc10..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_check_cast_9.java
-.class public dot.junit.opcodes.check_cast.d.T_check_cast_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-.limit regs 5
-
- check-cast v4, java/lang/String
- return-object v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.dfh
deleted file mode 100644
index 419f6e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.dfh
+++ /dev/null
@@ -1,264 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/check_cast/d/T_check_cast_9.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/check_cast/d/T_check_cast_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : d6bb4b2e
- 2E 4B BB D6
-// parsed: offset 12, len 20: signature : 1ebe...570d
- 1E BE 42 FD BC AF 7F 9D AB 10 86 B8 F1 D5 98 36 F6 E6 57 0D
-// parsed: offset 32, len 4: file_size : 576
- 40 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 440 (0x0001b8)
- B8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 336
- 50 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "LL"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 306 (0x000132) "Ldot/junit/opcodes/check_cast/d/T_check_cast_9;"
- 32 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 355 (0x000163) "Ljava/lang/Object;"
- 63 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 375 (0x000177) "Ljava/lang/String;"
- 77 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "T_check_cast_9.java"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 416 (0x0001a0) "V"
- A0 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 419 (0x0001a3) "run"
- A3 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/check_cast/d/T_check_cast_9;"
- 02 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/String;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "LL"
-// return_type_idx: 2 (0x000002) "Ljava/lang/String;"
-// parameters_off: 288 (0x000120)
- 01 00 00 00 02 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/check_cast/d/T_check_cast_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_check_cast_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 424 (0x0001a8)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 A8 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.check_cast.d.T_check_cast_9.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.check_cast.d.T_check_cast_9.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: check-cast v4, Ljava/lang/String; // class@0002
-//@mod 1F 04 02 00
- 1F 04 03 00
- // parsed: offset 284, len 2: |0002: return-object v4
- 11 04
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 1
- 01 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 4: TYPE_STRING_DATA_ITEM [1] "LL"
- 02 4C 4C 00
-// parsed: offset 306, len 49: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/check_cast/d/T_check_cast_9;"
- 2F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 63 68 65 63 6B 5F 63 61 73 74 2F 64 2F 54 5F 63 68 65 63 6B 5F 63 61 73 74 5F 39 3B 00
-// parsed: offset 355, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 375, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 395, len 21: TYPE_STRING_DATA_ITEM [5] "T_check_cast_9.java"
- 13 54 5F 63 68 65 63 6B 5F 63 61 73 74 5F 39 2E 6A 61 76 61 00
-// parsed: offset 416, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 419, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/check_cast/d/T_check_cast_9;"
- // parsed: offset 424, len 1: static_fields_size: 0
- 00
- // parsed: offset 425, len 1: instance_fields_size: 0
- 00
- // parsed: offset 426, len 1: direct_methods_size: 1
- 01
- // parsed: offset 427, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 428, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 429, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 432, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 434, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 435, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 436, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 438, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 440, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 444, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 456, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 468, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 480, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 492, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 504, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 516, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 528, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 540, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 552, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 20 00 00 01 00 00 00 A8 01 00 00
- // parsed: offset 564, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 440 (0x0001b8)
- 00 10 00 00 01 00 00 00 B8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java
deleted file mode 100644
index e2a1994..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmp_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.cmp_long.d.T_cmp_long_1;
-import dot.junit.opcodes.cmp_long.d.T_cmp_long_2;
-
-public class Test_cmp_long extends DxTestCase {
- /**
- * @title Arguments = 111234567891l > 111234567890l
- */
- public void testN1() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(1, t.run(111234567891l, 111234567890l));
- }
-
- /**
- * @title Arguments = 112234567890 = 112234567890
- */
- public void testN2() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(0, t.run(112234567890l, 112234567890l));
- }
-
- /**
- * @title Arguments = 112234567890 < 998876543210
- */
- public void testN3() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(-1, t.run(112234567890l, 998876543210l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this comparison of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_cmp_long_2 t = new T_cmp_long_2();
- try {
- t.run(123l, 3.145f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE > Long.MIN_VALUE
- */
- public void testB1() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(1, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE < Long.MAX_VALUE
- */
- public void testB2() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(-1, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1 > 0
- */
- public void testB3() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(1, t.run(1l, 0l));
- }
-
- /**
- * @title Arguments = 0 > -1
- */
- public void testB4() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(1, t.run(0l, -1l));
- }
-
- /**
- * @title Arguments = -1 < 0
- */
- public void testB5() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(-1, t.run(-1l, 0l));
- }
-
- /**
- * @title Arguments = 0 = 0
- */
- public void testB6() {
- T_cmp_long_1 t = new T_cmp_long_1();
- assertEquals(0, t.run(0l, 0l));
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, long
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.d
deleted file mode 100644
index 60b9654..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmp_long_1.java
-.class public dot.junit.opcodes.cmp_long.d.T_cmp_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)I
-.limit regs 14
-
- cmp-long v0, v10, v12
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.java
deleted file mode 100644
index 10a78e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmp_long.d;
-
-public class T_cmp_long_1 {
-
- public int run(long a, long b) {
- if (a > b) return 1;
- if (a == b) return 0;
- return -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.d
deleted file mode 100644
index e3bdfd4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmp_long_2.java
-.class public dot.junit.opcodes.cmp_long.d.T_cmp_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)I
-.limit regs 14
-
- cmp-long v0, v10, v12
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.java
deleted file mode 100644
index 4674e7a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmp_long.d;
-
-public class T_cmp_long_2 {
-
- public int run(long a, double b) {
- return -2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_3.d
deleted file mode 100644
index 3d25d6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmp_long_3.java
-.class public dot.junit.opcodes.cmp_long.d.T_cmp_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)I
-.limit regs 14
-
- const v10, 3.1415
- cmp-long v0, v10, v12
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_4.d
deleted file mode 100644
index 32c3050..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmp_long_4.java
-.class public dot.junit.opcodes.cmp_long.d.T_cmp_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)I
-.limit regs 14
-
- const v10, 1234
- cmp-long v0, v10, v12
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_5.d
deleted file mode 100644
index 9e86284..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmp_long_5.java
-.class public dot.junit.opcodes.cmp_long.d.T_cmp_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)I
-.limit regs 14
-
- const v10, 1234
- cmp-long v0, v9, v12
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_6.d
deleted file mode 100644
index 15ac1cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmp_long_6.java
-.class public dot.junit.opcodes.cmp_long.d.T_cmp_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)I
-.limit regs 14
-
- cmp-long v0, v10, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java
deleted file mode 100644
index fbf47a3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpg_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.cmpg_double.d.T_cmpg_double_1;
-import dot.junit.opcodes.cmpg_double.d.T_cmpg_double_3;
-
-public class Test_cmpg_double extends DxTestCase {
- /**
- * @title Arguments = 3.14d, 2.7d
- */
- public void testN1() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(1, t.run(3.14d, 2.7d));
- }
-
- /**
- * @title Arguments = -3.14d, 2.7d
- */
- public void testN2() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(-1, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Arguments = 3.14, 3.14
- */
- public void testN3() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(0, t.run(3.14d, 3.14d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this comparison of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_cmpg_double_3 t = new T_cmpg_double_3();
- try {
- t.run(123l, 3.145d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.NaN, Double.MAX_VALUE
- */
- public void testB1() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(1, t.run(Double.NaN, Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = +0, -0
- */
- public void testB2() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(0, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = Double.NEGATIVE_INFINITY, Double.MIN_VALUE
- */
- public void testB3() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(-1, t.run(Double.NEGATIVE_INFINITY, Double.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, Double.MAX_VALUE
- */
- public void testB4() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(1, t.run(Double.POSITIVE_INFINITY, Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY
- */
- public void testB5() {
- T_cmpg_double_1 t = new T_cmpg_double_1();
- assertEquals(1, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, float
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.d
deleted file mode 100644
index a76c3b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_double_1.java
-.class public dot.junit.opcodes.cmpg_double.d.T_cmpg_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- cmpg-double v0, v12, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.java
deleted file mode 100644
index 8488914..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpg_double.d;
-
-public class T_cmpg_double_1 {
-
- public int run(double a, double b) {
- if(a > b)
- return 1;
- if(a == b)
- return 0;
- return -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_2.d
deleted file mode 100644
index 5704511..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_double_2.java
-.class public dot.junit.opcodes.cmpg_double.d.T_cmpg_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- const v14, 3.14
- cmpg-double v0, v12, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.d
deleted file mode 100644
index 78d65ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_double_3.java
-.class public dot.junit.opcodes.cmpg_double.d.T_cmpg_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)I
-.limit regs 16
-
- cmpg-double v0, v12, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.java b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.java
deleted file mode 100644
index d5b8ca5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpg_double.d;
-
-public class T_cmpg_double_3 {
-
- public int run(long a, double b) {
- return -2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_4.d
deleted file mode 100644
index e38307c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_double_4.java
-.class public dot.junit.opcodes.cmpg_double.d.T_cmpg_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- const-wide v12, 12356
- cmpg-double v0, v12, v11
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_5.d
deleted file mode 100644
index bd43151..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_double_5.java
-.class public dot.junit.opcodes.cmpg_double.d.T_cmpg_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- cmpg-double v0, v12, v16
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_6.d
deleted file mode 100644
index 70c7f72..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_double_6.java
-.class public dot.junit.opcodes.cmpg_double.d.T_cmpg_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 16
- move v0, v14
- move v1, v14
- move v2, v15
- move v3, v15
-
- cmpg-double v0, v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java
deleted file mode 100644
index 1ff20a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpg_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.cmpg_float.d.T_cmpg_float_1;
-import dot.junit.opcodes.cmpg_float.d.T_cmpg_float_6;
-
-public class Test_cmpg_float extends DxTestCase {
- /**
- * @title Arguments = 3.14f, 2.7f
- */
- public void testN1() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(1, t.run(3.14f, 2.7f));
- }
-
- /**
- * @title Arguments = -3.14f, 2.7f
- */
- public void testN2() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(-1, t.run(-3.14f, 2.7f));
- }
-
- /**
- * @title Arguments = 3.14, 3.14
- */
- public void testN3() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(0, t.run(3.14f, 3.14f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this comparison of int and float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_cmpg_float_6 t = new T_cmpg_float_6();
- try {
- t.run(123, 3.145f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.NaN, Float.MAX_VALUE
- */
- public void testB1() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(1, t.run(Float.NaN, Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = +0, -0
- */
- public void testB2() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(0, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = Float.NEGATIVE_INFINITY, Float.MIN_VALUE
- */
- public void testB3() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(-1, t.run(Float.NEGATIVE_INFINITY, Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, Float.MAX_VALUE
- */
- public void testB4() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB5() {
- T_cmpg_float_1 t = new T_cmpg_float_1();
- assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.d
deleted file mode 100644
index a32772d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_float_1.java
-.class public dot.junit.opcodes.cmpg_float.d.T_cmpg_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- cmpg-float v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.java
deleted file mode 100644
index 9e3eb7e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpg_float.d;
-
-public class T_cmpg_float_1 {
-
- public int run(float a, float b) {
- if(a > b)
- return 1;
- if(a == b)
- return 0;
- return -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_2.d
deleted file mode 100644
index abaed4c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_float_2.java
-.class public dot.junit.opcodes.cmpg_float.d.T_cmpg_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- const-wide v1, 3.1414
- cmpg-float v0, v7, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_3.d
deleted file mode 100644
index f741d1e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_float_3.java
-.class public dot.junit.opcodes.cmpg_float.d.T_cmpg_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- const-wide v1, 234234
- cmpg-float v0, v1, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_4.d
deleted file mode 100644
index f40f08e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_float_4.java
-.class public dot.junit.opcodes.cmpg_float.d.T_cmpg_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- cmpg-float v0, v6, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_5.d
deleted file mode 100644
index 46a019a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_float_5.java
-.class public dot.junit.opcodes.cmpg_float.d.T_cmpg_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- cmpg-float v0, v9, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.d
deleted file mode 100644
index 1051f14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpg_float_6.java
-.class public dot.junit.opcodes.cmpg_float.d.T_cmpg_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 9
- cmpg-float v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.java b/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.java
deleted file mode 100644
index 8a785ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpg_float.d;
-
-public class T_cmpg_float_6 {
-
- public int run(int a, float b) {
- return -2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java
deleted file mode 100644
index 9f54c52..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpl_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.cmpl_double.d.T_cmpl_double_3;
-import dot.junit.opcodes.cmpl_double.d.T_cmpl_double_1;
-
-public class Test_cmpl_double extends DxTestCase {
- /**
- * @title Arguments = 3.14d, 2.7d
- */
- public void testN1() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(1, t.run(3.14d, 2.7d));
- }
-
- /**
- * @title Arguments = -3.14d, 2.7d
- */
- public void testN2() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(-1, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Arguments = 3.14, 3.14
- */
- public void testN3() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(0, t.run(3.14d, 3.14d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this comparison of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_cmpl_double_3 t = new T_cmpl_double_3();
- try {
- t.run(123l, 3.145d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.NaN, Double.MAX_VALUE
- */
- public void testB1() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(-1, t.run(Double.NaN, Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = +0, -0
- */
- public void testB2() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(0, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = Double.NEGATIVE_INFINITY, Double.MIN_VALUE
- */
- public void testB3() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(-1, t.run(Double.NEGATIVE_INFINITY, Double.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, Double.MAX_VALUE
- */
- public void testB4() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(1, t.run(Double.POSITIVE_INFINITY, Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB5() {
- T_cmpl_double_1 t = new T_cmpl_double_1();
- assertEquals(1, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, float
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.d
deleted file mode 100644
index 03a840e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_double_1.java
-.class public dot.junit.opcodes.cmpl_double.d.T_cmpl_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- cmpl-double v0, v12, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.java
deleted file mode 100644
index cb1587f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpl_double.d;
-
-public class T_cmpl_double_1 {
-
- public int run(double a, double b) {
- if(a > b)
- return 1;
- if(a == b)
- return 0;
- return -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_2.d
deleted file mode 100644
index 49566ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_double_2.java
-.class public dot.junit.opcodes.cmpl_double.d.T_cmpl_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- const v14, 3.14
- cmpl-double v0, v12, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.d
deleted file mode 100644
index e132fa0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_double_3.java
-.class public dot.junit.opcodes.cmpl_double.d.T_cmpl_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)I
-.limit regs 16
-
- cmpl-double v0, v12, v14
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.java b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.java
deleted file mode 100644
index 5f32c2c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpl_double.d;
-
-public class T_cmpl_double_3 {
-
- public int run(long a, double b) {
- return -2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_4.d
deleted file mode 100644
index cf01f55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_double_4.java
-.class public dot.junit.opcodes.cmpl_double.d.T_cmpl_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- const-wide v12, 12356
- cmpl-double v0, v12, v11
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_5.d
deleted file mode 100644
index 453ee43..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_double_5.java
-.class public dot.junit.opcodes.cmpl_double.d.T_cmpl_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)I
-.limit regs 16
-
- cmpl-double v0, v12, v16
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_6.d
deleted file mode 100644
index 720ec7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_double_6.java
-.class public dot.junit.opcodes.cmpl_double.d.T_cmpl_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 16
- move v0, v14
- move v1, v14
- move v2, v15
- move v3, v15
-
- cmpl-double v0, v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java
deleted file mode 100644
index 3ca0b5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpl_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.cmpl_float.d.T_cmpl_float_6;
-import dot.junit.opcodes.cmpl_float.d.T_cmpl_float_1;
-
-public class Test_cmpl_float extends DxTestCase {
- /**
- * @title Arguments = 3.14f, 2.7f
- */
- public void testN1() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(1, t.run(3.14f, 2.7f));
- }
-
- /**
- * @title Arguments = -3.14f, 2.7f
- */
- public void testN2() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(-1, t.run(-3.14f, 2.7f));
- }
-
- /**
- * @title Arguments = 3.14, 3.14
- */
- public void testN3() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(0, t.run(3.14f, 3.14f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this comparison of int and float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_cmpl_float_6 t = new T_cmpl_float_6();
- try {
- t.run(123, 3.145f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.NaN, Float.MAX_VALUE
- */
- public void testB1() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(-1, t.run(Float.NaN, Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = +0, -0
- */
- public void testB2() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(0, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = Float.NEGATIVE_INFINITY, Float.MIN_VALUE
- */
- public void testB3() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(-1, t.run(Float.NEGATIVE_INFINITY, Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, Float.MAX_VALUE
- */
- public void testB4() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB5() {
- T_cmpl_float_1 t = new T_cmpl_float_1();
- assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.d
deleted file mode 100644
index 48f14e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_float_1.java
-.class public dot.junit.opcodes.cmpl_float.d.T_cmpl_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- cmpl-float v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.java
deleted file mode 100644
index afd42d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpl_float.d;
-
-public class T_cmpl_float_1 {
-
- public int run(float a, float b) {
- if(a > b)
- return 1;
- if(a == b)
- return 0;
- return -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_2.d
deleted file mode 100644
index 67ed903..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_float_2.java
-.class public dot.junit.opcodes.cmpl_float.d.T_cmpl_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- const-wide v1, 3.1414
- cmpl-float v0, v7, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_3.d
deleted file mode 100644
index b43f114..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_float_3.java
-.class public dot.junit.opcodes.cmpl_float.d.T_cmpl_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- const-wide v1, 234234
- cmpl-float v0, v1, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_4.d
deleted file mode 100644
index a4aa08e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_float_4.java
-.class public dot.junit.opcodes.cmpl_float.d.T_cmpl_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- cmpl-float v0, v6, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_5.d
deleted file mode 100644
index d496c11..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_float_5.java
-.class public dot.junit.opcodes.cmpl_float.d.T_cmpl_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 9
- cmpl-float v0, v9, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.d
deleted file mode 100644
index 05a9e62..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_cmpl_float_6.java
-.class public dot.junit.opcodes.cmpl_float.d.T_cmpl_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 9
- cmpl-float v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.java b/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.java
deleted file mode 100644
index e41e14a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.cmpl_float.d;
-
-public class T_cmpl_float_6 {
-
- public int run(int a, float b) {
- return -2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_16/Test_const_16.java b/tools/vm-tests/src/dot/junit/opcodes/const_16/Test_const_16.java
deleted file mode 100644
index 00e6b78..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_16/Test_const_16.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_16.d.T_const_16_1;
-
-public class Test_const_16 extends DxTestCase {
-
- /**
- * @title const/16 v254, -20000
- */
- public void testN2() {
- T_const_16_1 t = new T_const_16_1();
- int a = -10000;
- int b = -10000;
- assertEquals(a + b, t.run());
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_16.d.T_const_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_16.d.T_const_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_1.d
deleted file mode 100644
index 6078e06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_16_1.java
-.class public dot.junit.opcodes.const_16.d.T_const_16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 255
-
- const/16 v254, -20000
- return v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_1.java
deleted file mode 100644
index 3285906..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_16.d;
-
-public class T_const_16_1 {
-
- public int run() {
- return -20000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_3.d
deleted file mode 100644
index 4e0bfa7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_16_3.java
-.class public dot.junit.opcodes.const_16.d.T_const_16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v3, 1234
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_4.d
deleted file mode 100644
index 4040879..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_16/d/T_const_16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_16_4.java
-.class public dot.junit.opcodes.const_16.d.T_const_16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const/16 v1, 1234
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_4/Test_const_4.java b/tools/vm-tests/src/dot/junit/opcodes/const_4/Test_const_4.java
deleted file mode 100644
index d9bb26b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_4/Test_const_4.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_4;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_4.d.T_const_4_1;
-
-public class Test_const_4 extends DxTestCase {
- /**
- * @title const/4 v15, -4
- */
- public void testN2() {
- T_const_4_1 t = new T_const_4_1();
- int a = -2;
- int b = -2;
- assertEquals(a + b, t.run());
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_4.d.T_const_4_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_4.d.T_const_4_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_1.d
deleted file mode 100644
index 77c522e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_4_1.java
-.class public dot.junit.opcodes.const_4.d.T_const_4_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 16
-
- const/4 v15, -4
- return v15
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_1.java
deleted file mode 100644
index a8b8ab3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_4.d;
-
-public class T_const_4_1 {
-
- public int run() {
- return -4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_3.d
deleted file mode 100644
index d435f16..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_4_3.java
-.class public dot.junit.opcodes.const_4.d.T_const_4_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/4 v3, 1
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_4.d
deleted file mode 100644
index 5ca94d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_4/d/T_const_4_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_4_4.java
-.class public dot.junit.opcodes.const_4.d.T_const_4_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const/4 v1, 2
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/const_class/TestStubs.java
deleted file mode 100644
index 3897d2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/TestStubs.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_class;
-
-//used by testE2
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/Test_const_class.java b/tools/vm-tests/src/dot/junit/opcodes/const_class/Test_const_class.java
deleted file mode 100644
index 93f5ee4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/Test_const_class.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_class;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_class.d.T_const_class_1;
-import dot.junit.opcodes.const_class.d.T_const_class_2;
-import dot.junit.opcodes.const_class.d.T_const_class_6;
-import dot.junit.opcodes.const_class.d.T_const_class_7;
-
-public class Test_const_class extends DxTestCase {
- /**
- * @title const-class v254, java/lang/String
- */
- public void testN1() {
- T_const_class_1 t = new T_const_class_1();
- Class c = t.run();
- assertEquals(0, c.getCanonicalName().compareTo("java.lang.String"));
- }
-
- /**
- * @title const-class v254, I
- */
- public void testN2() {
- T_const_class_2 t = new T_const_class_2();
- Class c = t.run();
- assertEquals(c.getCanonicalName(), "int");
- }
-
- /**
- * @title Class definition not found
- */
- public void testE1() {
- try {
- T_const_class_6 t = new T_const_class_6();
- t.run();
- fail("expected a verification exception");
- } catch (NoClassDefFoundError e) {
- // expected
- } catch(VerifyError e) {
- // expected
- }
- }
-
- /**
- * @title Class is not accessible
- */
- public void testE2() {
- //@uses dot.junit.opcodes.const_class.TestStubs
- //@uses dot.junit.opcodes.const_class.d.T_const_class_7
- try {
- T_const_class_7 t = new T_const_class_7();
- t.run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_class.d.T_const_class_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_class.d.T_const_class_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A18
- * @title constant pool index
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.const_class.d.T_const_class_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_1.d
deleted file mode 100644
index 6359d92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_1.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Class;
-.limit regs 255
-
- const-class v254, java/lang/String
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_1.java
deleted file mode 100644
index d95f659..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_class.d;
-
-public class T_const_class_1 {
-
- public Class run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_2.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_2.d
deleted file mode 100644
index 39bb30e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_2.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Class;
-.limit regs 255
-
- const-class v254, I
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_2.java b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_2.java
deleted file mode 100644
index 030d3e2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_class.d;
-
-public class T_const_class_2 {
-
- public Class run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_3.d
deleted file mode 100644
index 50da342..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_3.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-class v3, java/lang/Object
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_4.d
deleted file mode 100644
index 6f6b7b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_4.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-class v1, java/lang/Object
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_5.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_5.d
deleted file mode 100644
index 24186a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_5.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 255
-
- const-class v254, java/lang/Object
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_5.dfh b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_5.dfh
deleted file mode 100644
index db89eba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_5.dfh
+++ /dev/null
@@ -1,254 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/const_class/d/T_const_class_5.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/const_class/d/T_const_class_5.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : ad464cd4
- D4 4C 46 AD
-// parsed: offset 12, len 20: signature : 959c...4307
- 95 9C 6C 40 92 C8 1F 85 87 C2 86 A1 52 39 A6 87 C9 63 43 07
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "L"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/const_class/d/T_const_class_5;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 350 (0x00015e) "Ljava/lang/Object;"
- 5E 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 370 (0x000172) "Ljava/lang/String;"
- 72 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 390 (0x000186) "T_const_class_5.java"
- 86 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 412 (0x00019c) "V"
- 9C 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/const_class/d/T_const_class_5;"
- 02 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/String;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "L"
-// return_type_idx: 2 (0x000002) "Ljava/lang/String;"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/const_class/d/T_const_class_5;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_const_class_5.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.const_class.d.T_const_class_5.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.const_class.d.T_const_class_5.run"
- // parsed: offset 264, len 2: registers_size: 255
- FF 00
- // parsed: offset 266, len 2: ins_size: 1
- 01 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: const-class v254, Ljava/lang/Object; // class@0001
-//@mod 1C FE 01 00
- 1C FE 01 01
- // parsed: offset 284, len 2: |0002: return-object v254
- 11 FE
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "L"
- 01 4C 00
-// parsed: offset 299, len 51: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/const_class/d/T_const_class_5;"
- 31 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 63 6F 6E 73 74 5F 63 6C 61 73 73 2F 64 2F 54 5F 63 6F 6E 73 74 5F 63 6C 61 73 73 5F 35 3B 00
-// parsed: offset 350, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 370, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 390, len 22: TYPE_STRING_DATA_ITEM [5] "T_const_class_5.java"
- 14 54 5F 63 6F 6E 73 74 5F 63 6C 61 73 73 5F 35 2E 6A 61 76 61 00
-// parsed: offset 412, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/const_class/d/T_const_class_5;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_6.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_6.d
deleted file mode 100644
index bd893c9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_6.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Class;
-.limit regs 255
-
- const-class v254, java/lang/StringNNNNN
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_6.java b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_6.java
deleted file mode 100644
index 4dd4ad3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_class.d;
-
-public class T_const_class_6 {
-
- public Class run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_7.d b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_7.d
deleted file mode 100644
index 20d9749..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_class_7.java
-.class public dot.junit.opcodes.const_class.d.T_const_class_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Class;
-.limit regs 255
-
- const-class v254, dot/junit/opcodes/const_class/TestStubs
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_7.java b/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_7.java
deleted file mode 100644
index b67d795..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_class/d/T_const_class_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_class.d;
-
-public class T_const_class_7 {
-
- public Class run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_high16/Test_const_high16.java b/tools/vm-tests/src/dot/junit/opcodes/const_high16/Test_const_high16.java
deleted file mode 100644
index 68340a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_high16/Test_const_high16.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_high16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_high16.d.T_const_high16_1;
-
-public class Test_const_high16 extends DxTestCase {
- /**
- * @title const/high16 v254, 0x12340000
- */
- public void testN1() {
- T_const_high16_1 t = new T_const_high16_1();
- assertEquals(0x12340000, t.run());
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_high16.d.T_const_high16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_high16.d.T_const_high16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.d
deleted file mode 100644
index fcc1c2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_high16_1.java
-.class public dot.junit.opcodes.const_high16.d.T_const_high16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 255
-
- const/high16 v254, 0x12340000
- return v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.java
deleted file mode 100644
index df8cf3f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_high16.d;
-
-public class T_const_high16_1 {
-
- public int run() {
- return -20000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_3.d
deleted file mode 100644
index e207c68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_high16_3.java
-.class public dot.junit.opcodes.const_high16.d.T_const_high16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/high16 v3, 0x12340000
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_4.d
deleted file mode 100644
index f8caefa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_high16/d/T_const_high16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_high16_4.java
-.class public dot.junit.opcodes.const_high16.d.T_const_high16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const/high16 v1, 0x12340000
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/Test_const_string.java b/tools/vm-tests/src/dot/junit/opcodes/const_string/Test_const_string.java
deleted file mode 100644
index b5c778d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/Test_const_string.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_string;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_string.d.T_const_string_1;
-
-public class Test_const_string extends DxTestCase {
- /**
- * @title const-string v254, "android"
- */
- public void testN1() {
- T_const_string_1 t = new T_const_string_1();
- String s = t.run();
- assertEquals(s.compareTo("android"), 0);
-
- String s2 = t.run();
- assertTrue(s == s2);
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_string.d.T_const_string_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_string.d.T_const_string_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A9
- * @title constant pool index
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.const_string.d.T_const_string_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_1.d
deleted file mode 100644
index 11b3770..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_1.java
-.class public dot.junit.opcodes.const_string.d.T_const_string_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 255
-
- const-string v254, "android"
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_1.java
deleted file mode 100644
index 0bb9508..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_string.d;
-
-public class T_const_string_1 {
-
- public String run() {
- return "android";
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_3.d
deleted file mode 100644
index 773bd80..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_3.java
-.class public dot.junit.opcodes.const_string.d.T_const_string_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-string v3, "abc"
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_4.d
deleted file mode 100644
index d8b8519..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_4.java
-.class public dot.junit.opcodes.const_string.d.T_const_string_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-string v1, "abc"
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_5.d b/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_5.d
deleted file mode 100644
index 1ece763..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_5.java
-.class public dot.junit.opcodes.const_string.d.T_const_string_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 255
-
- const-string v254, "android"
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_5.dfh b/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_5.dfh
deleted file mode 100644
index 96a95b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string/d/T_const_string_5.dfh
+++ /dev/null
@@ -1,258 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/const_string/d/T_const_string_5.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/const_string/d/T_const_string_5.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 557d54bb
- BB 54 7D 55
-// parsed: offset 12, len 20: signature : ffa5...7ccb
- FF A5 C3 77 3F 0D DA AE 41 93 96 A8 0C B7 F6 FB 04 BB 7C CB
-// parsed: offset 32, len 4: file_size : 576
- 40 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 452 (0x0001c4)
- C4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 164 (0x0000a4)
- A4 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 188 (0x0000bc)
- BC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 212 (0x0000d4)
- D4 00 00 00
-// parsed: offset 104, len 4: data_size : 332
- 4C 01 00 00
-// parsed: offset 108, len 4: data_off : 244 (0x0000f4)
- F4 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 292 (0x000124) "<init>"
- 24 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 300 (0x00012c) "L"
- 2C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 303 (0x00012f) "Ldot/junit/opcodes/const_string/d/T_const_string_5;"
- 2F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 356 (0x000164) "Ljava/lang/Object;"
- 64 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 376 (0x000178) "Ljava/lang/String;"
- 78 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "T_const_string_5.java"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 419 (0x0001a3) "V"
- A3 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 422 (0x0001a6) "android"
- A6 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 431 (0x0001af) "run"
- AF 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/const_string/d/T_const_string_5;"
- 02 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/String;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 164, len 12: [0]
-// shorty_idx: 1 (0x000001) "L"
-// return_type_idx: 2 (0x000002) "Ljava/lang/String;"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 176, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 188, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 196, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 8 (0x000008) "run"
- 00 00 00 00 08 00 00 00
-// parsed: offset 204, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 212, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/const_string/d/T_const_string_5;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_const_string_5.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 436 (0x0001b4)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 B4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.const_string.d.T_const_string_5.<init>"
- // parsed: offset 244, len 2: registers_size: 1
- 01 00
- // parsed: offset 246, len 2: ins_size: 1
- 01 00
- // parsed: offset 248, len 2: outs_size: 1
- 01 00
- // parsed: offset 250, len 2: tries_size: 0
- 00 00
- // parsed: offset 252, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 256, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 260, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 266, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.const_string.d.T_const_string_5.run"
- // parsed: offset 268, len 2: registers_size: 255
- FF 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 0
- 00 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 284, len 4: |0000: const-string v254, "android" // string@0007
-//@mod 1A FE 07 00
- 1A FE 07 01
- // parsed: offset 288, len 2: |0002: return-object v254
- 11 FE
- // tries:
- // handlers:
-// parsed: offset 290, len 2: PADDING
- 00 00
-// parsed: offset 292, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 300, len 3: TYPE_STRING_DATA_ITEM [1] "L"
- 01 4C 00
-// parsed: offset 303, len 53: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/const_string/d/T_const_string_5;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 63 6F 6E 73 74 5F 73 74 72 69 6E 67 2F 64 2F 54 5F 63 6F 6E 73 74 5F 73 74 72 69 6E 67 5F 35 3B 00
-// parsed: offset 356, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 376, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 396, len 23: TYPE_STRING_DATA_ITEM [5] "T_const_string_5.java"
- 15 54 5F 63 6F 6E 73 74 5F 73 74 72 69 6E 67 5F 35 2E 6A 61 76 61 00
-// parsed: offset 419, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 422, len 9: TYPE_STRING_DATA_ITEM [7] "android"
- 07 61 6E 64 72 6F 69 64 00
-// parsed: offset 431, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/const_string/d/T_const_string_5;"
- // parsed: offset 436, len 1: static_fields_size: 0
- 00
- // parsed: offset 437, len 1: instance_fields_size: 0
- 00
- // parsed: offset 438, len 1: direct_methods_size: 1
- 01
- // parsed: offset 439, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 440, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 441, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 444, len 2: code_off: 244 (0x0000f4)
- F4 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 446, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 447, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 448, len 2: code_off: 268 (0x00010c)
- 8C 02
-// parsed: offset 450, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 452, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 456, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 468, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 480, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 148 (0x000094)
- 02 00 00 00 04 00 00 00 94 00 00 00
- // parsed: offset 492, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 164 (0x0000a4)
- 03 00 00 00 02 00 00 00 A4 00 00 00
- // parsed: offset 504, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 188 (0x0000bc)
- 05 00 00 00 03 00 00 00 BC 00 00 00
- // parsed: offset 516, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 212 (0x0000d4)
- 06 00 00 00 01 00 00 00 D4 00 00 00
- // parsed: offset 528, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 244 (0x0000f4)
- 01 20 00 00 02 00 00 00 F4 00 00 00
- // parsed: offset 540, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 292 (0x000124)
- 02 20 00 00 09 00 00 00 24 01 00 00
- // parsed: offset 552, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 20 00 00 01 00 00 00 B4 01 00 00
- // parsed: offset 564, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 452 (0x0001c4)
- 00 10 00 00 01 00 00 00 C4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java
deleted file mode 100644
index 6234730..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_string_jumbo;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_1;
-
-public class Test_const_string_jumbo extends DxTestCase {
- /**
- * @title const-string/jumbo v254, "android jumbo"
- */
- public void testN1() {
- T_const_string_jumbo_1 t = new T_const_string_jumbo_1();
- String s = t.run();
- assertEquals(0, s.compareTo("android jumbo"));
-
- String s2 = t.run();
- assertTrue(s == s2);
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A9
- * @title constant pool index
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.d
deleted file mode 100644
index 893baf2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_jumbo_1.java
-.class public dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 255
-
- const-string/jumbo v254, "android jumbo"
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.java
deleted file mode 100644
index 35b9b28..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_string_jumbo.d;
-
-public class T_const_string_jumbo_1 {
-
- public String run() {
- return "android jumbo";
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3.d
deleted file mode 100644
index c563141..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_jumbo_3.java
-.class public dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-string/jumbo v3, "abc jumbo"
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4.d
deleted file mode 100644
index c4088d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_jumbo_4.java
-.class public dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-string/jumbo v1, "abc jumbo"
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.d b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.d
deleted file mode 100644
index 649d3ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_string_jumbo_5.java
-.class public dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 255
-
- const-string v254, "android jumbo"
- return-object v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.dfh b/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.dfh
deleted file mode 100644
index 6ffa6a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.dfh
+++ /dev/null
@@ -1,258 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 38775db4
- B4 5D 77 38
-// parsed: offset 12, len 20: signature : b102...2cf6
- B1 02 9F DE 62 D1 2A B1 06 67 17 07 84 AB F4 FF 90 21 2C F6
-// parsed: offset 32, len 4: file_size : 600
- 58 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 476 (0x0001dc)
- DC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 164 (0x0000a4)
- A4 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 188 (0x0000bc)
- BC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 212 (0x0000d4)
- D4 00 00 00
-// parsed: offset 104, len 4: data_size : 356
- 64 01 00 00
-// parsed: offset 108, len 4: data_off : 244 (0x0000f4)
- F4 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 292 (0x000124) "<init>"
- 24 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 300 (0x00012c) "L"
- 2C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 303 (0x00012f) "Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5;"
- 2F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 368 (0x000170) "Ljava/lang/Object;"
- 70 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 388 (0x000184) "Ljava/lang/String;"
- 84 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 408 (0x000198) "T_const_string_jumbo_5.java"
- 98 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 437 (0x0001b5) "V"
- B5 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 440 (0x0001b8) "android jumbo"
- B8 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 455 (0x0001c7) "run"
- C7 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5;"
- 02 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/String;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 164, len 12: [0]
-// shorty_idx: 1 (0x000001) "L"
-// return_type_idx: 2 (0x000002) "Ljava/lang/String;"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 176, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 188, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 196, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 8 (0x000008) "run"
- 00 00 00 00 08 00 00 00
-// parsed: offset 204, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 212, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_const_string_jumbo_5.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 460 (0x0001cc)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 CC 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_5.<init>"
- // parsed: offset 244, len 2: registers_size: 1
- 01 00
- // parsed: offset 246, len 2: ins_size: 1
- 01 00
- // parsed: offset 248, len 2: outs_size: 1
- 01 00
- // parsed: offset 250, len 2: tries_size: 0
- 00 00
- // parsed: offset 252, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 256, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 260, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 266, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_5.run"
- // parsed: offset 268, len 2: registers_size: 255
- FF 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 0
- 00 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 284, len 4: |0000: const-string v254, "android jumbo" // string@0007
-//@mod 1A FE 07 00
- 1A FE 07 01
- // parsed: offset 288, len 2: |0002: return-object v254
- 11 FE
- // tries:
- // handlers:
-// parsed: offset 290, len 2: PADDING
- 00 00
-// parsed: offset 292, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 300, len 3: TYPE_STRING_DATA_ITEM [1] "L"
- 01 4C 00
-// parsed: offset 303, len 65: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5;"
- 3F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 63 6F 6E 73 74 5F 73 74 72 69 6E 67 5F 6A 75 6D 62 6F 2F 64 2F 54 5F 63 6F 6E 73 74 5F 73 74 72 69 6E 67 5F 6A 75 6D 62 6F 5F 35 3B 00
-// parsed: offset 368, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 388, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 408, len 29: TYPE_STRING_DATA_ITEM [5] "T_const_string_jumbo_5.java"
- 1B 54 5F 63 6F 6E 73 74 5F 73 74 72 69 6E 67 5F 6A 75 6D 62 6F 5F 35 2E 6A 61 76 61 00
-// parsed: offset 437, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 440, len 15: TYPE_STRING_DATA_ITEM [7] "android jumbo"
- 0D 61 6E 64 72 6F 69 64 20 6A 75 6D 62 6F 00
-// parsed: offset 455, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5;"
- // parsed: offset 460, len 1: static_fields_size: 0
- 00
- // parsed: offset 461, len 1: instance_fields_size: 0
- 00
- // parsed: offset 462, len 1: direct_methods_size: 1
- 01
- // parsed: offset 463, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 464, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 465, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 468, len 2: code_off: 244 (0x0000f4)
- F4 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 470, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 471, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 472, len 2: code_off: 268 (0x00010c)
- 8C 02
-// parsed: offset 474, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 476, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 480, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 492, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 504, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 148 (0x000094)
- 02 00 00 00 04 00 00 00 94 00 00 00
- // parsed: offset 516, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 164 (0x0000a4)
- 03 00 00 00 02 00 00 00 A4 00 00 00
- // parsed: offset 528, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 188 (0x0000bc)
- 05 00 00 00 03 00 00 00 BC 00 00 00
- // parsed: offset 540, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 212 (0x0000d4)
- 06 00 00 00 01 00 00 00 D4 00 00 00
- // parsed: offset 552, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 244 (0x0000f4)
- 01 20 00 00 02 00 00 00 F4 00 00 00
- // parsed: offset 564, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 292 (0x000124)
- 02 20 00 00 09 00 00 00 24 01 00 00
- // parsed: offset 576, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 460 (0x0001cc)
- 00 20 00 00 01 00 00 00 CC 01 00 00
- // parsed: offset 588, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 476 (0x0001dc)
- 00 10 00 00 01 00 00 00 DC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/Test_const_wide.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide/Test_const_wide.java
deleted file mode 100644
index 1ce3caa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/Test_const_wide.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_wide.d.T_const_wide_1;
-import dot.junit.opcodes.const_wide.d.T_const_wide_2;
-
-public class Test_const_wide extends DxTestCase {
- /**
- * @title const-wide v1, 1.2345678901232324E51
- */
- public void testN1() {
- T_const_wide_1 t = new T_const_wide_1();
- double a = 1234567890123232323232232323232323232323232323456788d;
- double b = 1d;
- assertEquals(a + b, t.run(), 0d);
- }
-
- /**
- * @title const-wide v253, 20000000000
- */
- public void testN2() {
- T_const_wide_2 t = new T_const_wide_2();
- long a = 10000000000l;
- long b = 10000000000l;
- assertEquals(a + b, t.run());
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide.d.T_const_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide.d.T_const_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.d
deleted file mode 100644
index 6809530..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_1.java
-.class public dot.junit.opcodes.const_wide.d.T_const_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()D
-.limit regs 3
-
- const-wide v1, 1.2345678901232324E51
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.java
deleted file mode 100644
index b219a93..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide.d;
-
-public class T_const_wide_1 {
-
- public double run(){
- return 1.54d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_2.d
deleted file mode 100644
index b2ddede..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_2.java
-.class public dot.junit.opcodes.const_wide.d.T_const_wide_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 255
-
- const-wide v253, 20000000000
- return-wide v253
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_2.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_2.java
deleted file mode 100644
index 0c9c438..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide.d;
-
-public class T_const_wide_2 {
-
- public long run() {
- return 20000000000l;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_3.d
deleted file mode 100644
index 1fab9ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_3.java
-.class public dot.junit.opcodes.const_wide.d.T_const_wide_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v3, 1234
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_4.d
deleted file mode 100644
index 9493e94..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide/d/T_const_wide_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_4.java
-.class public dot.junit.opcodes.const_wide.d.T_const_wide_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-wide v1, 3456
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java
deleted file mode 100644
index 941b00d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide_16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_wide_16.d.T_const_wide_16_1;
-
-public class Test_const_wide_16 extends DxTestCase {
-
- /**
- * @title const-wide/16 v253, 20000
- */
- public void testN1() {
- T_const_wide_16_1 t = new T_const_wide_16_1();
- long a = 10000l;
- long b = 10000l;
- assertEquals(a + b, t.run());
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_16.d.T_const_wide_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_16.d.T_const_wide_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.d
deleted file mode 100644
index 02c4e1c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_16_1.java
-.class public dot.junit.opcodes.const_wide_16.d.T_const_wide_16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 255
-
- const-wide/16 v253, 20000
- return-wide v253
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.java
deleted file mode 100644
index 708bf83..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide_16.d;
-
-public class T_const_wide_16_1 {
-
- public long run(){
- return 0l;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_3.d
deleted file mode 100644
index eebf570..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_16_3.java
-.class public dot.junit.opcodes.const_wide_16.d.T_const_wide_16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide/16 v3, 1234
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_4.d
deleted file mode 100644
index c1d79b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_16_4.java
-.class public dot.junit.opcodes.const_wide_16.d.T_const_wide_16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-wide/16 v1, 3456
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java
deleted file mode 100644
index 0847b3b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide_32;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_wide_32.d.T_const_wide_32_1;
-
-public class Test_const_wide_32 extends DxTestCase {
- /**
- * @title const-wide/32 v253, 20000000
- */
- public void testN1() {
- T_const_wide_32_1 t = new T_const_wide_32_1();
- long a = 10000000l;
- long b = 10000000l;
- assertEquals(a + b, t.run());
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_32.d.T_const_wide_32_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_32.d.T_const_wide_32_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.d
deleted file mode 100644
index 1962b17..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_32_1.java
-.class public dot.junit.opcodes.const_wide_32.d.T_const_wide_32_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 255
-
- const-wide/32 v253, 20000000
- return-wide v253
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.java
deleted file mode 100644
index 38be11f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide_32.d;
-
-public class T_const_wide_32_1 {
-
- public long run(){
- return 0l;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_3.d
deleted file mode 100644
index 44821ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_32_3.java
-.class public dot.junit.opcodes.const_wide_32.d.T_const_wide_32_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide/32 v3, 1234
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_4.d
deleted file mode 100644
index afae8dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_32_4.java
-.class public dot.junit.opcodes.const_wide_32.d.T_const_wide_32_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-wide/32 v1, 3456
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java
deleted file mode 100644
index 2dd3e32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide_high16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_1;
-
-public class Test_const_wide_high16 extends DxTestCase {
- /**
- * @title const-wide/high16 v252, 0x1234000000000000
- */
- public void testN2() {
- T_const_wide_high16_1 t = new T_const_wide_high16_1();
- assertEquals(0x1234000000000000l, t.run());
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_1.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_1.d
deleted file mode 100644
index c051462..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_high16_1.java
-.class public dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 255
-
- const-wide/high16 v252, 0x1234000000000000
- return-wide v252
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_1.java b/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_1.java
deleted file mode 100644
index 8a06f17..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.const_wide_high16.d;
-
-public class T_const_wide_high16_1 {
-
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_3.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_3.d
deleted file mode 100644
index 24a577c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_high16_3.java
-.class public dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide/high16 v3, 0x1234000000000000
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_4.d b/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_4.d
deleted file mode 100644
index 614e5a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/const_wide_high16/d/T_const_wide_high16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_const_wide_high16_4.java
-.class public dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const-wide/high16 v1, 0x1234000000000000
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/Test_div_double.java b/tools/vm-tests/src/dot/junit/opcodes/div_double/Test_div_double.java
deleted file mode 100644
index 5ce7889..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/Test_div_double.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_double.d.T_div_double_1;
-import dot.junit.opcodes.div_double.d.T_div_double_3;
-
-public class Test_div_double extends DxTestCase {
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
-
- T_div_double_1 t = new T_div_double_1();
- assertEquals(0.8598726114649682d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(0d, t.run(0, 3.14d));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
-
- T_div_double_1 t = new T_div_double_1();
- assertEquals(-1.162962962962963d, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
-
- T_div_double_1 t = new T_div_double_1();
- assertEquals(-1.162962962962963d, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this division of long and double makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_div_double_3 t = new T_div_double_3();
- try {
- t.run(3.14d, 12345l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB3() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = -2.7d, Double.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(0d, t.run(-2.7d, Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(Double.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(-0d, t.run(0, -2.7d));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(-2.7d, 0));
- }
-
- /**
- * @title Arguments = 1, Double.MAX_VALUE
- */
- public void testB8() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(1, Double.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, -1E-9f
- */
- public void testB9() {
- T_div_double_1 t = new T_div_double_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.MAX_VALUE, -1E-9f));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double / reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int / int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_1.d
deleted file mode 100644
index 359ec34..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_1.java
-.class public dot.junit.opcodes.div_double.d.T_div_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- div-double v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_1.java
deleted file mode 100644
index 734f130..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_double.d;
-
-public class T_div_double_1 {
-
- public double run(double a, double b) {
- return a/b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_2.d
deleted file mode 100644
index e09176a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2.java
-.class public dot.junit.opcodes.div_double.d.T_div_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- const v10, 3.1415
- div-double v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_3.d
deleted file mode 100644
index 02d7929..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_3.java
-.class public dot.junit.opcodes.div_double.d.T_div_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DJ)D
-.limit regs 14
-
- div-double v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_3.java b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_3.java
deleted file mode 100644
index 0cad5bb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_double.d;
-
-public class T_div_double_3 {
-
- public double run(double a, long b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_4.d
deleted file mode 100644
index 411b01a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_4.java
-.class public dot.junit.opcodes.div_double.d.T_div_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- div-double v0, v9, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_5.d
deleted file mode 100644
index 2675538..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_5.java
-.class public dot.junit.opcodes.div_double.d.T_div_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- div-double v0, v10, v14
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_6.d
deleted file mode 100644
index 9ef0732..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double/d/T_div_double_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_6.java
-.class public dot.junit.opcodes.div_double.d.T_div_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 14
- move v0, v12
- move v1, v12
- move v2, v13
- move v3, v13
- div-double v0, v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java
deleted file mode 100644
index 42332e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_double_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_1;
-import dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_3;
-
-public class Test_div_double_2addr extends DxTestCase {
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
-
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(0.8598726114649682d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(0d, t.run(0, 3.14d));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
-
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(-1.162962962962963d, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
-
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(-1.162962962962963d, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this division of long and double makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_div_double_2addr_3 t = new T_div_double_2addr_3();
- try {
- t.run(3.14d, 12345l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB3() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = -2.7d, Double.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(0d, t.run(-2.7d, Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(Double.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(-0d, t.run(0, -2.7d));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(-2.7d, 0));
- }
-
- /**
- * @title Arguments = 1, Double.MAX_VALUE
- */
- public void testB8() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(1, Double.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, -1E-9f
- */
- public void testB9() {
- T_div_double_2addr_1 t = new T_div_double_2addr_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.MAX_VALUE, -1E-9f));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double / reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int / int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.d
deleted file mode 100644
index 541526e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2addr_1.java
-.class public dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- div-double/2addr v10, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.java
deleted file mode 100644
index e853239..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_double_2addr.d;
-
-public class T_div_double_2addr_1 {
-
- public double run(double a, double b) {
- return a/b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_2.d
deleted file mode 100644
index 5921ceb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2addr_2.java
-.class public dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- const v0, 3.1415
- div-double/2addr v0, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.d
deleted file mode 100644
index 840ea8b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2addr_3.java
-.class public dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DJ)D
-.limit regs 14
-
- div-double/2addr v10, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.java b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.java
deleted file mode 100644
index 96d1e60..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_double_2addr.d;
-
-public class T_div_double_2addr_3 {
-
- public double run(double a, long b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4.d
deleted file mode 100644
index 5cee125..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2addr_4.java
-.class public dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- div-double/2addr v9, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5.d
deleted file mode 100644
index 2ef12c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2addr_5.java
-.class public dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- div-double/2addr v10, v14
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6.d
deleted file mode 100644
index 05fc08e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_double_2addr_6.java
-.class public dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 14
- move v0, v12
- move v1, v12
- move v2, v13
- move v3, v13
- div-double/2addr v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/Test_div_float.java b/tools/vm-tests/src/dot/junit/opcodes/div_float/Test_div_float.java
deleted file mode 100644
index 8671505..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/Test_div_float.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_float.d.T_div_float_1;
-import dot.junit.opcodes.div_float.d.T_div_float_5;
-
-public class Test_div_float extends DxTestCase {
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(0.8598726f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(0f, t.run(0, 3.14f));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(-1.162963f, t.run(-3.14f, 2.7f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this division of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_div_float_5 t = new T_div_float_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB3() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = -2.7f, Float.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(0f, t.run(-2.7f, Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(-0f, t.run(0, -2.7f));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(-2.7f, 0));
- }
-
- /**
- * @title Arguments = 1, Float.MAX_VALUE
- */
- public void testB8() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(1, Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, -1E-9f
- */
- public void testB9() {
- T_div_float_1 t = new T_div_float_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.MAX_VALUE, -1E-9f));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_1.d
deleted file mode 100644
index 5d59692..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_1.java
-.class public dot.junit.opcodes.div_float.d.T_div_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- div-float v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_1.java
deleted file mode 100644
index b75e42b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_float.d;
-
-public class T_div_float_1 {
-
- public float run(float a, float b) {
- return a/b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_2.d
deleted file mode 100644
index 4a82c48..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2.java
-.class public dot.junit.opcodes.div_float.d.T_div_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- const-wide v0, 3.14
- div-float v0, v0, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_3.d
deleted file mode 100644
index 9a8b28b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_3.java
-.class public dot.junit.opcodes.div_float.d.T_div_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- const-wide v0, 1234
- div-float v0, v7, v0
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_4.d
deleted file mode 100644
index ed7b149..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_4.java
-.class public dot.junit.opcodes.div_float.d.T_div_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- div-float v0, v5, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_5.d
deleted file mode 100644
index 4602631..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_5.java
-.class public dot.junit.opcodes.div_float.d.T_div_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)F
-.limit regs 8
- div-float v0, v6, v7
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_5.java b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_5.java
deleted file mode 100644
index 68d16fa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_float.d;
-
-public class T_div_float_5 {
-
- public float run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_6.d
deleted file mode 100644
index 4777687..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float/d/T_div_float_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_6.java
-.class public dot.junit.opcodes.div_float.d.T_div_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- div-float v0, v6, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java
deleted file mode 100644
index 3fdeb70..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_float_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_1;
-import dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_5;
-
-public class Test_div_float_2addr extends DxTestCase {
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(0.8598726f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(0f, t.run(0, 3.14f));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(-1.162963f, t.run(-3.14f, 2.7f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this division of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_div_float_2addr_5 t = new T_div_float_2addr_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB3() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = -2.7f, Float.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(0f, t.run(-2.7f, Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(-0f, t.run(0, -2.7f));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(-2.7f, 0));
- }
-
- /**
- * @title Arguments = 1, Float.MAX_VALUE
- */
- public void testB8() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(1, Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, -1E-9f
- */
- public void testB9() {
- T_div_float_2addr_1 t = new T_div_float_2addr_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.MAX_VALUE, -1E-9f));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.d
deleted file mode 100644
index 93362fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2addr_1.java
-.class public dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- div-float/2addr v6, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.java
deleted file mode 100644
index bfa9c61..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_float_2addr.d;
-
-public class T_div_float_2addr_1 {
-
- public float run(float a, float b) {
- return a/b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2.d
deleted file mode 100644
index 90ea869..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2addr_2.java
-.class public dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- const-wide v0, 3.14
- div-float/2addr v0, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3.d
deleted file mode 100644
index f9bddfd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2addr_3.java
-.class public dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- const-wide v0, 1234
- div-float/2addr v7, v0
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4.d
deleted file mode 100644
index 377cda1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2addr_4.java
-.class public dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- div-float/2addr v5, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.d
deleted file mode 100644
index 2f5a998..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2addr_5.java
-.class public dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)F
-.limit regs 8
- div-float/2addr v6, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.java
deleted file mode 100644
index fe4a948..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_float_2addr.d;
-
-public class T_div_float_2addr_5 {
-
- public float run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6.d
deleted file mode 100644
index ed354e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_float_2addr_6.java
-.class public dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
- div-float/2addr v6, v8
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/Test_div_int.java b/tools/vm-tests/src/dot/junit/opcodes/div_int/Test_div_int.java
deleted file mode 100644
index 14614a6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/Test_div_int.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_int.d.T_div_int_1;
-import dot.junit.opcodes.div_int.d.T_div_int_5;
-
-public class Test_div_int extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(2, t.run(8, 4));
- }
-
- /**
- * @title Rounding
- */
- public void testN2() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(268435455, t.run(1073741823, 4));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(0, t.run(0, 4));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(-3, t.run(-10, 3));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(-357913941, t.run(1073741824, -3));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(5965, t.run(-17895697, -3000));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this division of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_div_int_5 t = new T_div_int_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, -1
- */
- public void testB1() {
- T_div_int_1 t = new T_div_int_1();
- // result is MIN_VALUE because overflow occurs in this case
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, -1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB2() {
- T_div_int_1 t = new T_div_int_1();
- //fail("why this test causes floating point exception?");
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB3() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB4() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(-1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MAX_VALUE
- */
- public void testB5() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(0, t.run(1, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MIN_VALUE
- */
- public void testB6() {
- T_div_int_1 t = new T_div_int_1();
- assertEquals(0, t.run(1, Integer.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_div_int_1 t = new T_div_int_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_1.d
deleted file mode 100644
index aaaf0a3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_1.java
-.class public dot.junit.opcodes.div_int.d.T_div_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- div-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_1.java
deleted file mode 100644
index b43738d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int.d;
-
-public class T_div_int_1 {
-
- public int run(int a, int b) {
- return a/b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_2.d
deleted file mode 100644
index 8fb324c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2.java
-.class public dot.junit.opcodes.div_int.d.T_div_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v1, 3.1415
- div-int v0, v3, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_3.d
deleted file mode 100644
index 446cc2c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_3.java
-.class public dot.junit.opcodes.div_int.d.T_div_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v1, 31415
- div-int v0, v1, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_4.d
deleted file mode 100644
index c476934..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_4.java
-.class public dot.junit.opcodes.div_int.d.T_div_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- div-int v0, v1, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_5.d
deleted file mode 100644
index ad4c79c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_5.java
-.class public dot.junit.opcodes.div_int.d.T_div_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
-
- div-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_5.java
deleted file mode 100644
index 21ba362..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int.d;
-
-public class T_div_int_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_6.d
deleted file mode 100644
index 6da816d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int/d/T_div_int_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_6.java
-.class public dot.junit.opcodes.div_int.d.T_div_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- div-int v0, v2, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java
deleted file mode 100644
index 276c840..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_1;
-import dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_5;
-
-public class Test_div_int_2addr extends DxTestCase {
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(2, t.run(8, 4));
- }
-
- /**
- * @title Rounding
- */
- public void testN2() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(268435455, t.run(1073741823, 4));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(0, t.run(0, 4));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(-3, t.run(-10, 3));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(-357913941, t.run(1073741824, -3));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(5965, t.run(-17895697, -3000));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this division of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_div_int_2addr_5 t = new T_div_int_2addr_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, -1
- */
- public void testB1() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- // result is MIN_VALUE because overflow occurs in this case
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, -1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB2() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB3() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB4() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(-1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MAX_VALUE
- */
- public void testB5() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(0, t.run(1, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MIN_VALUE
- */
- public void testB6() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- assertEquals(0, t.run(1, Integer.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.d
deleted file mode 100644
index 00b88e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2addr_1.java
-.class public dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- div-int/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.java
deleted file mode 100644
index 67464ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_2addr.d;
-
-public class T_div_int_2addr_1 {
-
- public int run(int a, int b) {
- return a/b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2.d
deleted file mode 100644
index 10e15fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2addr_2.java
-.class public dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 3.1415
- div-int/2addr v3, v0
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3.d
deleted file mode 100644
index 483865e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2addr_3.java
-.class public dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 323231415
- div-int/2addr v3, v0
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4.d
deleted file mode 100644
index fbda213..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2addr_4.java
-.class public dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- div-int/2addr v1, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.d
deleted file mode 100644
index 2ee42a9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2addr_5.java
-.class public dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
-
- div-int/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.java
deleted file mode 100644
index f206f22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_2addr.d;
-
-public class T_div_int_2addr_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6.d
deleted file mode 100644
index 7742df6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_2addr_6.java
-.class public dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- div-int/2addr v2, v4
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java
deleted file mode 100644
index 02cc14a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_1;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_10;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_11;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_12;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_13;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_17;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_2;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_3;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_4;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_5;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_6;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_7;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_8;
-import dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_9;
-
-
-public class Test_div_int_lit16 extends DxTestCase {
- /**
- * @title Arguments = 8 / 4
- */
- public void testN1() {
- T_div_int_lit16_1 t = new T_div_int_lit16_1();
- assertEquals(2, t.run());
- }
-
- /**
- * @title Rounding
- */
- public void testN2() {
- T_div_int_lit16_2 t = new T_div_int_lit16_2();
- assertEquals(268435455, t.run());
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_div_int_lit16_3 t = new T_div_int_lit16_3();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_div_int_lit16_4 t = new T_div_int_lit16_4();
- assertEquals(-3, t.run());
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_div_int_lit16_5 t = new T_div_int_lit16_5();
- assertEquals(-357913941, t.run());
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_div_int_lit16_6 t = new T_div_int_lit16_6();
- assertEquals(5965, t.run());
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this division of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_div_int_lit16_17 t = new T_div_int_lit16_17();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE / -1
- */
- public void testB1() {
- T_div_int_lit16_7 t = new T_div_int_lit16_7();
- // result is MIN_VALUE because overflow occurs in this case
- assertEquals(Integer.MIN_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE / 1
- */
- public void testB2() {
- T_div_int_lit16_8 t = new T_div_int_lit16_8();
- assertEquals(Integer.MIN_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE / 1
- */
- public void testB3() {
- T_div_int_lit16_9 t = new T_div_int_lit16_9();
- assertEquals(Integer.MAX_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE / Short.MAX_VALUE
- */
- public void testB4() {
- T_div_int_lit16_10 t = new T_div_int_lit16_10();
- assertEquals(-65538, t.run());
- }
-
- /**
- * @title Arguments = 1 / Short.MAX_VALUE
- */
- public void testB5() {
- T_div_int_lit16_11 t = new T_div_int_lit16_11();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = 1 / Short.MIN_VALUE
- */
- public void testB6() {
- T_div_int_lit16_12 t = new T_div_int_lit16_12();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_div_int_lit16_13 t = new T_div_int_lit16_13();
- try {
- t.run();
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.d
deleted file mode 100644
index 6b57fb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_1.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 8
- div-int/lit16 v0, v2, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.java
deleted file mode 100644
index 3a1df06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_1 {
-
- public int run() {
- return 8 / 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.d
deleted file mode 100644
index d665855..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_10.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -2147483648
- div-int/lit16 v0, v2, 32767
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.java
deleted file mode 100644
index 46925a9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_10 {
-
- public int run() {
- return Integer.MIN_VALUE / Short.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.d
deleted file mode 100644
index 9f6cd95..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_11.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- div-int/lit16 v0, v2, 32767
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.java
deleted file mode 100644
index b0b3e69..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_11 {
-
- public int run() {
- return 1 / Short.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.d
deleted file mode 100644
index e99957a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_12.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- div-int/lit16 v0, v2, -32768
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.java
deleted file mode 100644
index be1428e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_12 {
-
- public int run() {
- return 1 / Short.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.d
deleted file mode 100644
index 4115385..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_13.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- div-int/lit16 v0, v2, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.java
deleted file mode 100644
index bbbab37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_13 {
-
- public int run() {
- return 1 / 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14.d
deleted file mode 100644
index 3731d36..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_14.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide v1, 31415
- div-int/lit16 v1, v1, 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15.d
deleted file mode 100644
index 27fba6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_15.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide v1, 3.1415
- div-int/lit16 v1, v1, 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16.d
deleted file mode 100644
index 6caadaf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_16.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- div-int/lit16 v1, v3, 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.d
deleted file mode 100644
index b60a81d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_17.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
-
- div-int/lit16 v0, v3, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.java
deleted file mode 100644
index 71cee9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_17 {
-
- public int run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18.d
deleted file mode 100644
index 6215666..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_18.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- div-int/lit16 v0, v4, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.d
deleted file mode 100644
index dd4e3f6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_2.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1073741823
- div-int/lit16 v0, v2, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.java
deleted file mode 100644
index 10a63dd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_2 {
-
- public int run() {
- return 1073741823 / 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.d
deleted file mode 100644
index b3b4713..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_3.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 0
- div-int/lit16 v0, v2, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.java
deleted file mode 100644
index ad3d6d4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_3 {
-
- public int run() {
- return 0 / 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.d
deleted file mode 100644
index e131fc4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_4.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -10
- div-int/lit16 v0, v2, 3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.java
deleted file mode 100644
index cbf7f0b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_4 {
-
- public int run() {
- return -10 / 3;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.d
deleted file mode 100644
index b61badf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_5.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1073741824
- div-int/lit16 v0, v2, -3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.java
deleted file mode 100644
index 3a1d497..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_5 {
-
- public int run() {
- return 1073741824 / -3;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.d
deleted file mode 100644
index c97edff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_6.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -17895697
- div-int/lit16 v0, v2, -3000
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.java
deleted file mode 100644
index 7875953..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_6 {
-
- public int run() {
- return -17895697 / -3000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.d
deleted file mode 100644
index 66cc917..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_7.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -2147483648
- div-int/lit16 v0, v2, -1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.java
deleted file mode 100644
index 3fa111c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_7 {
-
- public int run() {
- return Integer.MIN_VALUE / -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.d
deleted file mode 100644
index 6f2fd00..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_8.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -2147483648
- div-int/lit16 v0, v2, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.java
deleted file mode 100644
index 3389e8c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_8 {
-
- public int run() {
- return Integer.MIN_VALUE / 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.d
deleted file mode 100644
index 68f757e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit16_9.java
-.class public dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 2147483647
- div-int/lit16 v0, v2, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.java
deleted file mode 100644
index bf34419..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit16.d;
-
-public class T_div_int_lit16_9 {
-
- public int run() {
- return Integer.MAX_VALUE / 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java
deleted file mode 100644
index e2c4057..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_17;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_1;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_10;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_11;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_12;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_13;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_2;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_3;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_4;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_5;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_6;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_7;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_8;
-import dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_9;
-
-public class Test_div_int_lit8 extends DxTestCase {
- /**
- * @title Arguments = 8 / 4
- */
- public void testN1() {
- T_div_int_lit8_1 t = new T_div_int_lit8_1();
- assertEquals(2, t.run());
- }
-
- /**
- * @title Rounding
- */
- public void testN2() {
- T_div_int_lit8_2 t = new T_div_int_lit8_2();
- assertEquals(268435455, t.run());
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_div_int_lit8_3 t = new T_div_int_lit8_3();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_div_int_lit8_4 t = new T_div_int_lit8_4();
- assertEquals(-3, t.run());
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_div_int_lit8_5 t = new T_div_int_lit8_5();
- assertEquals(-357913941, t.run());
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_div_int_lit8_6 t = new T_div_int_lit8_6();
- assertEquals(596523, t.run());
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this division of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_div_int_lit8_17 t = new T_div_int_lit8_17();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE / -1
- */
- public void testB1() {
- T_div_int_lit8_7 t = new T_div_int_lit8_7();
- // result is MIN_VALUE because overflow occurs in this case
- assertEquals(Integer.MIN_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE / 1
- */
- public void testB2() {
- T_div_int_lit8_8 t = new T_div_int_lit8_8();
- assertEquals(Integer.MIN_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE / 1
- */
- public void testB3() {
- T_div_int_lit8_9 t = new T_div_int_lit8_9();
- assertEquals(Integer.MAX_VALUE, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE / Byte.MAX_VALUE
- */
- public void testB4() {
- T_div_int_lit8_10 t = new T_div_int_lit8_10();
- assertEquals(-16909320, t.run());
- }
-
- /**
- * @title Arguments = 1 / Byte.MAX_VALUE
- */
- public void testB5() {
- T_div_int_lit8_11 t = new T_div_int_lit8_11();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = 1 / Byte.MIN_VALUE
- */
- public void testB6() {
- T_div_int_lit8_12 t = new T_div_int_lit8_12();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_div_int_lit8_13 t = new T_div_int_lit8_13();
- try {
- t.run();
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int / double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long / int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.d
deleted file mode 100644
index 4c6a389..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_1.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 8
- div-int/lit8 v0, v2, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.java
deleted file mode 100644
index 04177b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_1 {
-
- public int run() {
- return 8 / 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.d
deleted file mode 100644
index 25c0e77..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_10.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -2147483648
- div-int/lit8 v0, v2, 127
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.java
deleted file mode 100644
index 8c71346..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_10 {
-
- public int run() {
- return Integer.MIN_VALUE / Byte.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.d
deleted file mode 100644
index 9522183..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_11.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- div-int/lit8 v0, v2, 127
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.java
deleted file mode 100644
index 9e2d788..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_11 {
-
- public int run() {
- return 1 / Byte.MAX_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.d
deleted file mode 100644
index cd72c52..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_12.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- div-int/lit8 v0, v2, -128
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.java
deleted file mode 100644
index 9468233..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_12 {
-
- public int run() {
- return 1 / Byte.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.d
deleted file mode 100644
index 1465ebc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_13.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1
- div-int/lit8 v0, v2, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.java
deleted file mode 100644
index 2e8cbcb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_13 {
-
- public int run() {
- return 1 / 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14.d
deleted file mode 100644
index 492ccbc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_14.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide v1, 31415
- div-int/lit8 v1, v1, 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15.d
deleted file mode 100644
index 88d70a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_15.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide v1, 3.1415
- div-int/lit8 v1, v1, 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16.d
deleted file mode 100644
index f93542a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_16.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- div-int/lit8 v1, v3, 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.d
deleted file mode 100644
index b4169d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_17.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
-
- div-int/lit8 v0, v3, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.java
deleted file mode 100644
index 329612d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_17 {
-
- public int run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18.d
deleted file mode 100644
index 10859c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_18.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- div-int/lit8 v0, v4, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.d
deleted file mode 100644
index 96145c1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_2.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1073741823
- div-int/lit8 v0, v2, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.java
deleted file mode 100644
index 496ac7d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_2 {
-
- public int run() {
- return 1073741823 / 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.d
deleted file mode 100644
index a93a8b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_3.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 0
- div-int/lit8 v0, v2, 4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.java
deleted file mode 100644
index 29829ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_3 {
-
- public int run() {
- return 0 / 4;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.d
deleted file mode 100644
index 458cfb1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_4.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -10
- div-int/lit8 v0, v2, 3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.java
deleted file mode 100644
index f92aed1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_4 {
-
- public int run() {
- return -10 / 3;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.d
deleted file mode 100644
index 3901a7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_5.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 1073741824
- div-int/lit8 v0, v2, -3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.java
deleted file mode 100644
index bb60183..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_5 {
-
- public int run() {
- return 1073741824 / -3;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.d
deleted file mode 100644
index 35f9c63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_6.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -17895697
- div-int/lit8 v0, v2, -30
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.java
deleted file mode 100644
index d071b33..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_6 {
-
- public int run() {
- return -17895697 / -30;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.d
deleted file mode 100644
index 0d4f492..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_7.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -2147483648
- div-int/lit8 v0, v2, -1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.java
deleted file mode 100644
index 7f7180a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_7 {
-
- public int run() {
- return Integer.MIN_VALUE / -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.d
deleted file mode 100644
index ee80b01..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_8.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, -2147483648
- div-int/lit8 v0, v2, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.java
deleted file mode 100644
index 5563dd8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_8 {
-
- public int run() {
- return Integer.MIN_VALUE / 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.d
deleted file mode 100644
index 466cf0a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_int_lit8_9.java
-.class public dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const v2, 2147483647
- div-int/lit8 v0, v2, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.java
deleted file mode 100644
index 5c62b29..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_int_lit8.d;
-
-public class T_div_int_lit8_9 {
-
- public int run() {
- return Integer.MAX_VALUE / 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/Test_div_long.java b/tools/vm-tests/src/dot/junit/opcodes/div_long/Test_div_long.java
deleted file mode 100644
index b0e1d31..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/Test_div_long.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_long.d.T_div_long_1;
-import dot.junit.opcodes.div_long.d.T_div_long_2;
-
-
-public class Test_div_long extends DxTestCase {
- /**
- * @title Arguments = 100000000000l, 40000000000l
- */
- public void testN1() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(2l, t.run(100000000000l, 40000000000l));
- }
-
- /**
- * @title Rounding
- */
- public void testN2() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(8l, t.run(98765432123456l, 12345678912345l));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(0l, t.run(0l, 98765432123456l));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(-8, t.run(-98765432123456l, 12345678912345l));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(-8, t.run(98765432123456l, -12345678912345l));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(80l, t.run(-98765432123456l, -1234567891234l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this division of long and double makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_div_long_2 t = new T_div_long_2();
- try {
- t.run(1234l, 3.1415d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, -1
- */
- public void testB1() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, -1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1
- */
- public void testB2() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, 1
- */
- public void testB3() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(9223372036854775807L, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, Long.MAX_VALUE
- */
- public void testB4() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(-1, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Long.MAX_VALUE
- */
- public void testB5() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(0, t.run(1, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Long.MIN_VALUE
- */
- public void testB6() {
- T_div_long_1 t = new T_div_long_1();
- assertEquals(0, t.run(1, Long.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_div_long_1 t = new T_div_long_1();
- try {
- t.run(12345678912345l, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int / long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float / long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_1.d
deleted file mode 100644
index fdf2445..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_1.java
-.class public dot.junit.opcodes.div_long.d.T_div_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- div-long v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_1.java
deleted file mode 100644
index 783d7ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_long.d;
-
-
-public class T_div_long_1 {
-
- public long run(long a, long b) {
- return a/b;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_2.d
deleted file mode 100644
index e72e2a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2.java
-.class public dot.junit.opcodes.div_long.d.T_div_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- div-long v0, v10, v12
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_2.java
deleted file mode 100644
index e6b3456..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_long.d;
-
-
-public class T_div_long_2 {
-
- public long run(long a, double b) {
- return 0;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_3.d
deleted file mode 100644
index 6a43649..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_3.java
-.class public dot.junit.opcodes.div_long.d.T_div_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v10, 1234
- div-long v0, v10, v12
- return-wide v12
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_4.d
deleted file mode 100644
index 409b45a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_4.java
-.class public dot.junit.opcodes.div_long.d.T_div_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v10, 3.14
- div-long v0, v10, v12
- return-wide v12
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_5.d
deleted file mode 100644
index 648b110..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_5.java
-.class public dot.junit.opcodes.div_long.d.T_div_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- div-long v0, v9, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_6.d
deleted file mode 100644
index b2a6d0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long/d/T_div_long_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_6.java
-.class public dot.junit.opcodes.div_long.d.T_div_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- div-long v0, v10, v14
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java
deleted file mode 100644
index 5ba3dad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_1;
-import dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_2;
-
-public class Test_div_long_2addr extends DxTestCase {
- /**
- * @title Arguments = 100000000000l, 40000000000l
- */
- public void testN1() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(2l, t.run(100000000000l, 40000000000l));
- }
-
- /**
- * @title Rounding
- */
- public void testN2() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(8l, t.run(98765432123456l, 12345678912345l));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(0l, t.run(0l, 98765432123456l));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(-8, t.run(-98765432123456l, 12345678912345l));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(-8, t.run(98765432123456l, -12345678912345l));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(80l, t.run(-98765432123456l, -1234567891234l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this division of long and double makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_div_long_2addr_2 t = new T_div_long_2addr_2();
- try {
- t.run(1234l, 3.1415d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, -1
- */
- public void testB1() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, -1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1
- */
- public void testB2() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, 1
- */
- public void testB3() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(9223372036854775807L, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, Long.MAX_VALUE
- */
- public void testB4() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(-1, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Long.MAX_VALUE
- */
- public void testB5() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(0, t.run(1, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Long.MIN_VALUE
- */
- public void testB6() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- assertEquals(0, t.run(1, Long.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- try {
- t.run(12345678912345l, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int / long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float / long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference / long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.d
deleted file mode 100644
index 0ae9ff3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2addr_1.java
-.class public dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- div-long/2addr v10, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.java
deleted file mode 100644
index 031cac2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_long_2addr.d;
-
-
-public class T_div_long_2addr_1 {
-
- public long run(long a, long b) {
- return a/b;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.d
deleted file mode 100644
index f01fcf4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2addr_2.java
-.class public dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- div-long/2addr v10, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.java b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.java
deleted file mode 100644
index 674284e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.div_long_2addr.d;
-
-
-public class T_div_long_2addr_2 {
-
- public long run(long a, double b) {
- return 0;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3.d
deleted file mode 100644
index 09e48c3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2addr_3.java
-.class public dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v0, 1234
- div-long/2addr v0, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_4.d
deleted file mode 100644
index 6d91919..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2addr_4.java
-.class public dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- const v0, 3.14
- div-long/2addr v0, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5.d
deleted file mode 100644
index ed7fdfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2addr_5.java
-.class public dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- div-long/2addr v9, v12
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6.d
deleted file mode 100644
index 83e2b30..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_div_long_2addr_6.java
-.class public dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- div-long/2addr v10, v14
- return-wide v10
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java
deleted file mode 100644
index 780ffef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.double_to_float.d.T_double_to_float_1;
-import dot.junit.opcodes.double_to_float.d.T_double_to_float_3;
-
-public class Test_double_to_float extends DxTestCase {
- /**
- * @title Argument = 2.71
- */
- public void testN1() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(2.71f, t.run(2.71d));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(1f, t.run(1d));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(-1f, t.run(-1d));
- }
-
- /**
- * @title Type of argument - long. Dalvik doens't distinguish 64-bits types internally,
- * so this conversion of long to float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_double_to_float_3 t = new T_double_to_float_3();
- try {
- t.run(12345l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Double.MAX_VALUE
- */
- public void testB1() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Double.MAX_VALUE));
- }
-
- /**
- * @title Argument = Double.MIN_VALUE
- */
- public void testB2() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(0f, t.run(Double.MIN_VALUE));
- }
-
- /**
- * @title Argument = -0
- */
- public void testB3() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(-0f, t.run(-0d));
- }
-
- /**
- * @title Argument = NaN
- */
- public void testB4() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertTrue(Float.isNaN(t.run(Double.NaN)));
- }
-
- /**
- * @title Argument = POSITIVE_INFINITY
- */
- public void testB5() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertTrue(Float.isInfinite(t.run(Double.POSITIVE_INFINITY)));
- }
-
- /**
- * @title Argument = NEGATIVE_INFINITY
- */
- public void testB6() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertTrue(Float.isInfinite(t.run(Double.NEGATIVE_INFINITY)));
- }
-
-
- /**
- * @title Argument = -Double.MIN_VALUE
- */
- public void testB7() {
- T_double_to_float_1 t = new T_double_to_float_1();
- assertEquals(-0f, t.run(-4.9E-324d));
- }
-
-
- /**
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.d
deleted file mode 100644
index 24b332f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_float_1.java
-.class public dot.junit.opcodes.double_to_float.d.T_double_to_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)F
-.limit regs 8
-
- double-to-float v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.java
deleted file mode 100644
index c2cf023..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_float.d;
-
-public class T_double_to_float_1 {
-
- public float run(double a) {
- return (float)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_2.d
deleted file mode 100644
index 402cfac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_float_2.java
-.class public dot.junit.opcodes.double_to_float.d.T_double_to_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)F
-.limit regs 8
-
- const v6, 3.14
- double-to-float v0, v6
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.d
deleted file mode 100644
index 1cbf6f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_float_3.java
-.class public dot.junit.opcodes.double_to_float.d.T_double_to_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)F
-.limit regs 8
-
- double-to-float v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.java
deleted file mode 100644
index f4be401..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_float.d;
-
-public class T_double_to_float_3 {
-
- public float run(long a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_4.d
deleted file mode 100644
index 135e7ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_4.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_float_4.java
-.class public dot.junit.opcodes.double_to_float.d.T_double_to_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)F
-.limit regs 8
-
- double-to-float v0, v5
-
- const v3, 3.14
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_5.d
deleted file mode 100644
index 80adf03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_float_5.java
-.class public dot.junit.opcodes.double_to_float.d.T_double_to_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)F
-.limit regs 8
-
- double-to-float v0, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_6.d
deleted file mode 100644
index 9c65fb8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_float_6.java
-.class public dot.junit.opcodes.double_to_float.d.T_double_to_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)V
-.limit regs 8
-
- move v0, v7
- move v1, v7
- double-to-float v0, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java
deleted file mode 100644
index 86a3cdc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.double_to_int.d.T_double_to_int_1;
-import dot.junit.opcodes.double_to_int.d.T_double_to_int_3;
-
-
-public class Test_double_to_int extends DxTestCase {
- /**
- * @title Argument = 2.9999999d
- */
- public void testN1() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(2, t.run(2.9999999d));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(1, t.run(1d));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(-1, t.run(-1d));
- }
-
- /**
- * @title Type of argument - long. Dalvik doens't distinguish 64-bits types internally,
- * so this conversion of long to int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_double_to_int_3 t = new T_double_to_int_3();
- try {
- t.run(12345l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = -0
- */
- public void testB1() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(0, t.run(-0d));
- }
-
- /**
- * @title Argument = Double.MAX_VALUE
- */
- public void testB2() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Double.MAX_VALUE));
- }
-
- /**
- * @title Argument = Double.MIN_VALUE
- */
- public void testB3() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(0, t.run(Double.MIN_VALUE));
- }
-
- /**
- * @title Argument = NaN
- */
- public void testB4() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(0, t.run(Double.NaN));
- }
-
- /**
- * @title Argument = POSITIVE_INFINITY
- */
- public void testB5() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Argument = NEGATIVE_INFINITY
- */
- public void testB6() {
- T_double_to_int_1 t = new T_double_to_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Double.NEGATIVE_INFINITY));
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.d
deleted file mode 100644
index 82f2467..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_int_1.java
-.class public dot.junit.opcodes.double_to_int.d.T_double_to_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- double-to-int v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.java
deleted file mode 100644
index 208a2bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_int.d;
-
-public class T_double_to_int_1 {
-
- public int run(double a) {
- return (int)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_2.d
deleted file mode 100644
index 7e3a98b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_int_2.java
-.class public dot.junit.opcodes.double_to_int.d.T_double_to_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- const v6, 3.14
- double-to-int v0, v6
- const v1, 123
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.d
deleted file mode 100644
index 07f855a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_int_3.java
-.class public dot.junit.opcodes.double_to_int.d.T_double_to_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- double-to-int v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.java
deleted file mode 100644
index 03e205b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_int.d;
-
-public class T_double_to_int_3 {
-
- public int run(long a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_4.d
deleted file mode 100644
index 1f62ffb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_4.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_int_4.java
-.class public dot.junit.opcodes.double_to_int.d.T_double_to_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- double-to-int v0, v5
-
- const v3, 123
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_5.d
deleted file mode 100644
index e4477d8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_int_5.java
-.class public dot.junit.opcodes.double_to_int.d.T_double_to_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- double-to-int v0, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_6.d
deleted file mode 100644
index ecbe761..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_int_6.java
-.class public dot.junit.opcodes.double_to_int.d.T_double_to_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)V
-.limit regs 8
-
- move v0, v7
- move v1, v7
- double-to-int v0, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java
deleted file mode 100644
index 089558e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.double_to_long.d.T_double_to_long_1;
-import dot.junit.opcodes.double_to_long.d.T_double_to_long_3;
-
-public class Test_double_to_long extends DxTestCase {
- /**
- * @title Argument = 2.9999999
- */
- public void testN1() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(2l, t.run(2.9999999d));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(1l, t.run(1d));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(-1l, t.run(-1d));
- }
-
- /**
- * @title Type of argument - long. Dalvik doens't distinguish 64-bits types internally,
- * so this conversion of long to long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_double_to_long_3 t = new T_double_to_long_3();
- try {
- t.run(12345l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Double.MAX_VALUE
- */
- public void testB1() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(Long.MAX_VALUE, t.run(Double.MAX_VALUE));
- }
-
- /**
- * @title Argument = Double.MIN_VALUE
- */
- public void testB2() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(0, t.run(Double.MIN_VALUE));
- }
-
- /**
- * @title Argument = -0
- */
- public void testB3() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(0l, t.run(-0));
- }
-
- /**
- * @title Argument = NaN
- */
- public void testB4() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(0l, t.run(Double.NaN));
- }
-
- /**
- * @title Argument = POSITIVE_INFINITY
- */
- public void testB5() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(Long.MAX_VALUE, t.run(Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Argument = NEGATIVE_INFINITY
- */
- public void testB6() {
- T_double_to_long_1 t = new T_double_to_long_1();
- assertEquals(Long.MIN_VALUE, t.run(Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.d
deleted file mode 100644
index 677d352..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_long_1.java
-.class public dot.junit.opcodes.double_to_long.d.T_double_to_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)J
-.limit regs 8
-
- double-to-long v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.java
deleted file mode 100644
index 11469d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_long.d;
-
-public class T_double_to_long_1 {
-
- public long run(double a) {
- return (long)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_2.d
deleted file mode 100644
index 54740b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_long_2.java
-.class public dot.junit.opcodes.double_to_long.d.T_double_to_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)J
-.limit regs 8
-
- const v6, 3.14
- double-to-long v0, v6
- const-wide v2, 123
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.d
deleted file mode 100644
index 1f2293d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_long_3.java
-.class public dot.junit.opcodes.double_to_long.d.T_double_to_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 8
-
- const-wide v6, 32380293
- double-to-long v0, v6
- const-wide v2, 123
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.java b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.java
deleted file mode 100644
index 043a2ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.double_to_long.d;
-
-public class T_double_to_long_3 {
-
- public long run(long a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_4.d
deleted file mode 100644
index df716b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_4.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_long_4.java
-.class public dot.junit.opcodes.double_to_long.d.T_double_to_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)J
-.limit regs 8
-
- double-to-long v0, v5
-
- const-wide v2, 123
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_5.d
deleted file mode 100644
index 8b11c73..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_long_5.java
-.class public dot.junit.opcodes.double_to_long.d.T_double_to_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)J
-.limit regs 8
-
- double-to-long v0, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_6.d
deleted file mode 100644
index 6aeb8fd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_double_to_long_6.java
-.class public dot.junit.opcodes.double_to_long.d.T_double_to_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)V
-.limit regs 8
-
- move v0, v7
- move v1, v7
- double-to-long v0, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java
deleted file mode 100644
index 5bac3cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.fill_array_data;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.fill_array_data.d.T_fill_array_data_1;
-import dot.junit.opcodes.fill_array_data.d.T_fill_array_data_2;
-
-public class Test_fill_array_data extends DxTestCase {
- /**
- * @title array of ints
- */
- public void testN1() {
- int arr[] = new int[5];
- T_fill_array_data_1 t = new T_fill_array_data_1();
- t.run(arr);
- for(int i = 0; i < 5; i++)
- assertEquals(i + 1, arr[i]);
- }
-
- /**
- * @title array of doubles
- */
- public void testN2() {
- double arr[] = new double[5];
- T_fill_array_data_2 t = new T_fill_array_data_2();
- t.run(arr);
- for(int i = 0; i < 5; i++)
- assertEquals((double)(i + 1), arr[i]);
- }
-
- /**
- * @title If there are less elements in the table than the array provides space for,
- * the remaining array elements stay untouched.
- */
- public void testN3() {
- int arr[] = new int[10];
- T_fill_array_data_1 t = new T_fill_array_data_1();
- t.run(arr);
- for(int i = 0; i < 5; i++)
- assertEquals(i + 1, arr[i]);
- for(int i = 5; i < 10; i++)
- assertEquals(0, arr[i]);
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE1() {
- T_fill_array_data_1 t = new T_fill_array_data_1();
- try {
- t.run(null);
- } catch(NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title expected ArrayIndexOutOfBoundsException
- */
- public void testE2() {
- int arr[] = new int[2];
- T_fill_array_data_1 t = new T_fill_array_data_1();
- try {
- t.run(arr);
- } catch(ArrayIndexOutOfBoundsException e) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference (not array)
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title array of Objects
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title array type and data size shall be consistent
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title offset to table shall be inside method
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title the size and the list must be consistent.
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B22
- * @title packed-switch-data pseudo-instructions must not be reachable by control flow
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title table has wrong ident code
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_1.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_1.d
deleted file mode 100644
index 1c97601..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_1.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_1.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- fill-array-data v9 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_1.java b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_1.java
deleted file mode 100644
index c2a43a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.fill_array_data.d;
-
-public class T_fill_array_data_1 {
- public void run(int[] arr) {
- return;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.d
deleted file mode 100644
index b462d1c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_11.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- fill-array-data v9 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.dfh
deleted file mode 100644
index bed70ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.dfh
+++ /dev/null
@@ -1,264 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 59eb4a7d
- 7D 4A EB 59
-// parsed: offset 12, len 20: signature : 083f...2af8
- 08 3F 75 AF 24 45 09 F6 52 52 56 37 0A 56 D4 2A 88 76 2A F8
-// parsed: offset 32, len 4: file_size : 604
- 5C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 468 (0x0001d4)
- D4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 364
- 6C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 322 (0x000142) "<init>"
- 42 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 330 (0x00014a) "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_11;"
- 4A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 390 (0x000186) "Ljava/lang/Object;"
- 86 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 410 (0x00019a) "T_fill_array_data_11.java"
- 9A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 437 (0x0001b5) "V"
- B5 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 440 (0x0001b8) "VL"
- B8 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 444 (0x0001bc) "[I"
- BC 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 448 (0x0001c0) "run"
- C0 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_11;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "[I"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "VL"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 316 (0x00013c)
- 05 00 00 00 02 00 00 00 3C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_fill_array_data_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 453 (0x0001c5)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 C5 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.fill_array_data.d.T_fill_array_data_11.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.fill_array_data.d.T_fill_array_data_11.run"
- // parsed: offset 264, len 2: registers_size: 10
- 0A 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 18
- 12 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: fill-array-data v9, 00000004 // +0x00000004
- 26 09 04 00 00 00
- // parsed: offset 286, len 2: |0003: return-void
- 0E 00
- // parsed: offset 288, len 28: |0004: array-data (14 units)
-//@mod 00 03 04 00 05 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00
- 00 03 04 00 06 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 316, len 4: size: 1
- 01 00 00 00
- // parsed: offset 320, len 2: type_item [0] type_idx: 3
- 03 00
-// parsed: offset 322, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 330, len 60: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_11;"
- 3A 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 2F 64 2F 54 5F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 5F 31 31 3B 00
-// parsed: offset 390, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 410, len 27: TYPE_STRING_DATA_ITEM [3] "T_fill_array_data_11.java"
- 19 54 5F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 437, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 440, len 4: TYPE_STRING_DATA_ITEM [5] "VL"
- 02 56 4C 00
-// parsed: offset 444, len 4: TYPE_STRING_DATA_ITEM [6] "[I"
- 02 5B 49 00
-// parsed: offset 448, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_11;"
- // parsed: offset 453, len 1: static_fields_size: 0
- 00
- // parsed: offset 454, len 1: instance_fields_size: 0
- 00
- // parsed: offset 455, len 1: direct_methods_size: 1
- 01
- // parsed: offset 456, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 457, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 458, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 461, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 463, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 464, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 465, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 467, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 468, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 472, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 484, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 496, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 508, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 520, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 532, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 544, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 556, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 316 (0x00013c)
- 01 10 00 00 01 00 00 00 3C 01 00 00
- // parsed: offset 568, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 322 (0x000142)
- 02 20 00 00 08 00 00 00 42 01 00 00
- // parsed: offset 580, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 453 (0x0001c5)
- 00 20 00 00 01 00 00 00 C5 01 00 00
- // parsed: offset 592, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 10 00 00 01 00 00 00 D4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_12.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_12.d
deleted file mode 100644
index c3ce952..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_12.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_12.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- goto Label0
- fill-array-data v9 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
- return-void
-Label0:
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.d
deleted file mode 100644
index 0066d29..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_13.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- fill-array-data v9 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.dfh b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.dfh
deleted file mode 100644
index 0d2fc68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.dfh
+++ /dev/null
@@ -1,264 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_13.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : b2054cd3
- D3 4C 05 B2
-// parsed: offset 12, len 20: signature : 1649...5e25
- 16 49 CA 77 41 DC DC A0 6E 2C E0 E8 CE 58 95 B0 0B 40 5E 25
-// parsed: offset 32, len 4: file_size : 604
- 5C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 468 (0x0001d4)
- D4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 364
- 6C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 322 (0x000142) "<init>"
- 42 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 330 (0x00014a) "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_13;"
- 4A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 390 (0x000186) "Ljava/lang/Object;"
- 86 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 410 (0x00019a) "T_fill_array_data_13.java"
- 9A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 437 (0x0001b5) "V"
- B5 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 440 (0x0001b8) "VL"
- B8 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 444 (0x0001bc) "[I"
- BC 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 448 (0x0001c0) "run"
- C0 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_13;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "[I"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "VL"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 316 (0x00013c)
- 05 00 00 00 02 00 00 00 3C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_13;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_fill_array_data_13.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 453 (0x0001c5)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 C5 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.fill_array_data.d.T_fill_array_data_13.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.fill_array_data.d.T_fill_array_data_13.run"
- // parsed: offset 264, len 2: registers_size: 10
- 0A 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 18
- 12 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: fill-array-data v9, 00000004 // +0x00000004
- 26 09 04 00 00 00
- // parsed: offset 286, len 2: |0003: return-void
- 0E 00
- // parsed: offset 288, len 28: |0004: array-data (14 units)
-//@mod 00 03 04 00 05 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00
- 00 05 04 00 05 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 316, len 4: size: 1
- 01 00 00 00
- // parsed: offset 320, len 2: type_item [0] type_idx: 3
- 03 00
-// parsed: offset 322, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 330, len 60: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_13;"
- 3A 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 2F 64 2F 54 5F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 5F 31 33 3B 00
-// parsed: offset 390, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 410, len 27: TYPE_STRING_DATA_ITEM [3] "T_fill_array_data_13.java"
- 19 54 5F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 5F 31 33 2E 6A 61 76 61 00
-// parsed: offset 437, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 440, len 4: TYPE_STRING_DATA_ITEM [5] "VL"
- 02 56 4C 00
-// parsed: offset 444, len 4: TYPE_STRING_DATA_ITEM [6] "[I"
- 02 5B 49 00
-// parsed: offset 448, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_13;"
- // parsed: offset 453, len 1: static_fields_size: 0
- 00
- // parsed: offset 454, len 1: instance_fields_size: 0
- 00
- // parsed: offset 455, len 1: direct_methods_size: 1
- 01
- // parsed: offset 456, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 457, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 458, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 461, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 463, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 464, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 465, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 467, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 468, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 472, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 484, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 496, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 508, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 520, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 532, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 544, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 556, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 316 (0x00013c)
- 01 10 00 00 01 00 00 00 3C 01 00 00
- // parsed: offset 568, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 322 (0x000142)
- 02 20 00 00 08 00 00 00 42 01 00 00
- // parsed: offset 580, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 453 (0x0001c5)
- 00 20 00 00 01 00 00 00 C5 01 00 00
- // parsed: offset 592, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 10 00 00 01 00 00 00 D4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_2.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_2.d
deleted file mode 100644
index 6167ef7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_2.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_2.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([D)V
-.limit regs 10
-
- fill-array-data v9 D
- 1.0
- 2.0
- 3.0
- 4.0
- 5.0
- fill-array-data-end
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_2.java b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_2.java
deleted file mode 100644
index 7c56ef0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.fill_array_data.d;
-
-public class T_fill_array_data_2 {
- public void run(double[] arr) {
- return;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_3.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_3.d
deleted file mode 100644
index e6ecd1e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_3.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_3.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- fill-array-data v10 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_4.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_4.d
deleted file mode 100644
index 221ef8b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_4.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_4.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D[I)V
-.limit regs 10
-
- fill-array-data v7 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_5.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_5.d
deleted file mode 100644
index cc98351..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_5.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_5.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J[I)V
-.limit regs 10
-
- fill-array-data v7 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_6.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_6.d
deleted file mode 100644
index 61990a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_6.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_6.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- fill-array-data v8 I
- 0
- 0
- 0
- 0
- 0
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_7.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_7.d
deleted file mode 100644
index 8ba5155..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_7.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_7.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([Ljava/lang/Object;)V
-.limit regs 10
-
- fill-array-data v9 I
- 0
- 0
- 0
- 0
- 0
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_8.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_8.d
deleted file mode 100644
index e90eb86..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_8.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_8.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([D)V
-.limit regs 10
-
- fill-array-data v9 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.d b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.d
deleted file mode 100644
index 0a5e008..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fill_array_data_9.java
-.class public dot.junit.opcodes.fill_array_data.d.T_fill_array_data_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([I)V
-.limit regs 10
-
- fill-array-data v9 I
- 1
- 2
- 3
- 4
- 5
- fill-array-data-end
-
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.dfh
deleted file mode 100644
index 22cb9c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.dfh
+++ /dev/null
@@ -1,264 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/fill_array_data/d/T_fill_array_data_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 29604be4
- E4 4B 60 29
-// parsed: offset 12, len 20: signature : 38a2...97b7
- 38 A2 2B 55 35 C5 4B 31 51 6E 60 02 2B 76 F6 FC FF 7A 97 B7
-// parsed: offset 32, len 4: file_size : 604
- 5C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 468 (0x0001d4)
- D4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 364
- 6C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 322 (0x000142) "<init>"
- 42 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 330 (0x00014a) "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_9;"
- 4A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 389 (0x000185) "Ljava/lang/Object;"
- 85 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 409 (0x000199) "T_fill_array_data_9.java"
- 99 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 435 (0x0001b3) "V"
- B3 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 438 (0x0001b6) "VL"
- B6 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 442 (0x0001ba) "[I"
- BA 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 446 (0x0001be) "run"
- BE 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_9;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "[I"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "VL"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 316 (0x00013c)
- 05 00 00 00 02 00 00 00 3C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_fill_array_data_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 451 (0x0001c3)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 C3 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.fill_array_data.d.T_fill_array_data_9.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.fill_array_data.d.T_fill_array_data_9.run"
- // parsed: offset 264, len 2: registers_size: 10
- 0A 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 18
- 12 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: fill-array-data v9, 00000004 // +0x00000004
-//@mod 26 09 04 00 00 00
- 26 09 04 01 00 00
- // parsed: offset 286, len 2: |0003: return-void
- 0E 00
- // parsed: offset 288, len 28: |0004: array-data (14 units)
- 00 03 04 00 05 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 316, len 4: size: 1
- 01 00 00 00
- // parsed: offset 320, len 2: type_item [0] type_idx: 3
- 03 00
-// parsed: offset 322, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 330, len 59: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_9;"
- 39 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 2F 64 2F 54 5F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 5F 39 3B 00
-// parsed: offset 389, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 409, len 26: TYPE_STRING_DATA_ITEM [3] "T_fill_array_data_9.java"
- 18 54 5F 66 69 6C 6C 5F 61 72 72 61 79 5F 64 61 74 61 5F 39 2E 6A 61 76 61 00
-// parsed: offset 435, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 438, len 4: TYPE_STRING_DATA_ITEM [5] "VL"
- 02 56 4C 00
-// parsed: offset 442, len 4: TYPE_STRING_DATA_ITEM [6] "[I"
- 02 5B 49 00
-// parsed: offset 446, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/fill_array_data/d/T_fill_array_data_9;"
- // parsed: offset 451, len 1: static_fields_size: 0
- 00
- // parsed: offset 452, len 1: instance_fields_size: 0
- 00
- // parsed: offset 453, len 1: direct_methods_size: 1
- 01
- // parsed: offset 454, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 455, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 456, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 459, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 461, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 462, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 463, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 465, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 468, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 472, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 484, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 496, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 508, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 520, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 532, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 544, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 556, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 316 (0x00013c)
- 01 10 00 00 01 00 00 00 3C 01 00 00
- // parsed: offset 568, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 322 (0x000142)
- 02 20 00 00 08 00 00 00 42 01 00 00
- // parsed: offset 580, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 451 (0x0001c3)
- 00 20 00 00 01 00 00 00 C3 01 00 00
- // parsed: offset 592, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 10 00 00 01 00 00 00 D4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/TestStubs.java
deleted file mode 100644
index 344f5c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/TestStubs.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array;
-
-// used by T_filled_new_array_11
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java
deleted file mode 100644
index b17c29b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.filled_new_array.d.T_filled_new_array_1;
-import dot.junit.opcodes.filled_new_array.d.T_filled_new_array_10;
-import dot.junit.opcodes.filled_new_array.d.T_filled_new_array_11;
-import dot.junit.opcodes.filled_new_array.d.T_filled_new_array_2;
-
-public class Test_filled_new_array extends DxTestCase {
- /**
- * @title array of ints
- */
- public void testN1() {
- T_filled_new_array_1 t = new T_filled_new_array_1();
- int[] arr = t.run(1, 2, 3, 4, 5);
- assertNotNull(arr);
- assertEquals(5, arr.length);
- for(int i = 0; i < 5; i++)
- assertEquals(i + 1, arr[i]);
- }
-
- /**
- * @title array of objects
- */
- public void testN2() {
- T_filled_new_array_2 t = new T_filled_new_array_2();
- String s = "android";
- Object[] arr = t.run(t, s);
- assertNotNull(arr);
- assertEquals(2, arr.length);
- assertEquals(t, arr[0]);
- assertEquals(s, arr[1]);
- }
-
- /**
- * @constraint A17
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
-
- }
-
- /**
- * @constraint B1
- * @title try to pass obj ref instead of int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title try to pass long instead of int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title try to create non-array type
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title invalid arg count
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title attempt to instantiate String[] and fill it with reference to assignment-incompatible class
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_9");
- fail("expected a verification exception");
- } catch(Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title attempt to instantiate array of non-existent class
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.filled_new_array.d.T_filled_new_array_10
- try {
- T_filled_new_array_10 T = new T_filled_new_array_10();
- T.run();
- fail("expected a NoClassDefFoundError exception");
- } catch(NoClassDefFoundError t) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title attempt to instantiate array of inaccessible class
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.filled_new_array.d.T_filled_new_array_11
- //@uses dot.junit.opcodes.filled_new_array.TestStubs
- try {
- T_filled_new_array_11 T = new T_filled_new_array_11();
- T.run();
- fail("expected a IllegalAccessError exception");
- } catch(IllegalAccessError t) {
- // expected
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.d
deleted file mode 100644
index 0c195eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_1.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array {v5, v6, v7, v8, v9}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.java
deleted file mode 100644
index 05cd56f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array.d;
-
-public class T_filled_new_array_1 {
- public int[] run(int a, int b, int c, int d, int e) {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.d
deleted file mode 100644
index ccfc7d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2009 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_10.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[Ljava/lang/Object;
-.limit regs 10
- const v9, 0
- filled-new-array {v9}, [Ljava/lang/StringNNNNN;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.java
deleted file mode 100644
index 4caf263..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array.d;
-
-public class T_filled_new_array_10 {
- public Object[] run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.d
deleted file mode 100644
index dca1ca3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2009 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_11.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[Ljava/lang/Object;
-.limit regs 10
- const v9, 0
- filled-new-array {v9}, [Ldot/junit/opcodes/filled_new_array/TestStubs;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.java
deleted file mode 100644
index f25d58f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array.d;
-
-public class T_filled_new_array_11 {
- public Object[] run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.d
deleted file mode 100644
index 532158e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_2.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)[Ljava/lang/Object;
-.limit regs 10
- filled-new-array {v8, v9}, [Ljava/lang/Object;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.java
deleted file mode 100644
index 0edab9b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array.d;
-
-public class T_filled_new_array_2 {
- public Object[] run(Object a, Object b) {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.d
deleted file mode 100644
index 69d1f79..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_3.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array {v5, v6, v7, v8, v9}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.dfh
deleted file mode 100644
index deace06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 5ca65099
- 99 50 A6 5C
-// parsed: offset 12, len 20: signature : 05d9...c8d3
- 05 D9 B4 47 7C 61 39 F5 99 31 79 2A DE 6F 88 65 3C 8D C8 D3
-// parsed: offset 32, len 4: file_size : 604
- 5C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 468 (0x0001d4)
- D4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 356
- 64 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "LIIIII"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 333 (0x00014d) "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_3;"
- 4D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 394 (0x00018a) "Ljava/lang/Object;"
- 8A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 414 (0x00019e) "T_filled_new_array_3.java"
- 9E 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 441 (0x0001b9) "V"
- B9 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 444 (0x0001bc) "[I"
- BC 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 448 (0x0001c0) "run"
- C0 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_3;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 7 (0x000007) "[I"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 2 (0x000002) "LIIIII"
-// return_type_idx: 4 (0x000004) "[I"
-// parameters_off: 300 (0x00012c)
- 02 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_filled_new_array_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 453 (0x0001c5)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 C5 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array.d.T_filled_new_array_3.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array.d.T_filled_new_array_3.run"
- // parsed: offset 272, len 2: registers_size: 10
- 0A 00
- // parsed: offset 274, len 2: ins_size: 6
- 06 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 288, len 6: |0000: filled-new-array {v5, v6, v7, v8, v9}, [I // class@0004
-//@mod 24 59 04 00 65 87
- 24 59 04 01 65 87
- // parsed: offset 294, len 2: |0003: move-result-object v0
- 0C 00
- // parsed: offset 296, len 2: |0004: return-object v0
- 11 00
- // tries:
- // handlers:
-// parsed: offset 298, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 5
- 05 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
- // parsed: offset 308, len 2: type_item [2] type_idx: 0
- 00 00
- // parsed: offset 310, len 2: type_item [3] type_idx: 0
- 00 00
- // parsed: offset 312, len 2: type_item [4] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 8: TYPE_STRING_DATA_ITEM [2] "LIIIII"
- 06 4C 49 49 49 49 49 00
-// parsed: offset 333, len 61: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_3;"
- 3B 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 2F 64 2F 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 33 3B 00
-// parsed: offset 394, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 414, len 27: TYPE_STRING_DATA_ITEM [5] "T_filled_new_array_3.java"
- 19 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 33 2E 6A 61 76 61 00
-// parsed: offset 441, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 444, len 4: TYPE_STRING_DATA_ITEM [7] "[I"
- 02 5B 49 00
-// parsed: offset 448, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_3;"
- // parsed: offset 453, len 1: static_fields_size: 0
- 00
- // parsed: offset 454, len 1: instance_fields_size: 0
- 00
- // parsed: offset 455, len 1: direct_methods_size: 1
- 01
- // parsed: offset 456, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 457, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 458, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 461, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 463, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 464, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 465, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 467, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 468, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 472, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 484, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 496, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 508, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 520, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 532, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 544, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 556, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 568, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 580, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 453 (0x0001c5)
- 00 20 00 00 01 00 00 00 C5 01 00 00
- // parsed: offset 592, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 10 00 00 01 00 00 00 D4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_4.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_4.d
deleted file mode 100644
index ac6b1b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_4.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array {v5, v6, v7, v8, v10}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_5.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_5.d
deleted file mode 100644
index c2702a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_5.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array {v5, v6, v7, v8, v4}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_6.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_6.d
deleted file mode 100644
index 6be462d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_6.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIIJ)V
-.limit regs 11
- filled-new-array {v5, v6, v7, v8, v9}, [I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_7.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_7.d
deleted file mode 100644
index 129a800..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_7.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array {v5, v6, v7, v8, v9}, I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.d
deleted file mode 100644
index 951e06a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_8.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 10
-
- invoke-direct {v9}, java/lang/Object/<init>()V
-
- const v5, 0
- const v6, 0
- const v7, 0
- const v8, 0
- const v9, 0
- filled-new-array {v5, v6, v7, v8, v9}, [I
- move-result-object v0
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array {v5, v6, v7, v8, v9}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.dfh
deleted file mode 100644
index 343d149..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.dfh
+++ /dev/null
@@ -1,297 +0,0 @@
-// Processing 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.dex'...
-// Opened 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 5bac58f0
- F0 58 AC 5B
-// parsed: offset 12, len 20: signature : d1b9...67e0
- D1 B9 FB 64 E5 F3 AB 93 DC 90 83 01 BD F0 6C A0 7E B2 67 E0
-// parsed: offset 32, len 4: file_size : 644
- 84 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 508 (0x0001fc)
- FC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 396
- 8C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 354 (0x000162) "<init>"
- 62 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 362 (0x00016a) "I"
- 6A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 365 (0x00016d) "LIIIII"
- 6D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 373 (0x000175) "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_8;"
- 75 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 434 (0x0001b2) "Ljava/lang/Object;"
- B2 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 454 (0x0001c6) "T_filled_new_array_8.java"
- C6 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 481 (0x0001e1) "V"
- E1 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 484 (0x0001e4) "[I"
- E4 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 488 (0x0001e8) "run"
- E8 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_8;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 7 (0x000007) "[I"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 2 (0x000002) "LIIIII"
-// return_type_idx: 4 (0x000004) "[I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 04 00 00 00 54 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_filled_new_array_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 493 (0x0001ed)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 ED 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array.d.T_filled_new_array_8.<init>"
- // parsed: offset 248, len 2: registers_size: 10
- 0A 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 23
- 17 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v9}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 09 00
- // parsed: offset 270, len 6: |0003: const v5, #float 0.000000 // #0x00000000 int
- 14 05 00 00 00 00
- // parsed: offset 276, len 6: |0006: const v6, #float 0.000000 // #0x00000000 int
- 14 06 00 00 00 00
- // parsed: offset 282, len 6: |0009: const v7, #float 0.000000 // #0x00000000 int
- 14 07 00 00 00 00
- // parsed: offset 288, len 6: |000c: const v8, #float 0.000000 // #0x00000000 int
- 14 08 00 00 00 00
- // parsed: offset 294, len 6: |000f: const v9, #float 0.000000 // #0x00000000 int
- 14 09 00 00 00 00
- // parsed: offset 300, len 6: |0012: filled-new-array {v5, v6, v7, v8, v9}, [I // class@0004
-//@mod 24 59 04 00 65 87
- 24 F9 04 00 65 87
- // parsed: offset 306, len 2: |0015: move-result-object v0
- 0C 00
- // parsed: offset 308, len 2: |0016: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 310, len 2: PADDING
- 00 00
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array.d.T_filled_new_array_8.run"
- // parsed: offset 312, len 2: registers_size: 10
- 0A 00
- // parsed: offset 314, len 2: ins_size: 6
- 06 00
- // parsed: offset 316, len 2: outs_size: 0
- 00 00
- // parsed: offset 318, len 2: tries_size: 0
- 00 00
- // parsed: offset 320, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 324, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 328, len 6: |0000: filled-new-array {v5, v6, v7, v8, v9}, [I // class@0004
-//@mod 24 59 04 00 65 87
- 24 F9 04 00 65 87
- // parsed: offset 334, len 2: |0003: move-result-object v0
- 0C 00
- // parsed: offset 336, len 2: |0004: return-object v0
- 11 00
- // tries:
- // handlers:
-// parsed: offset 338, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 5
- 05 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 346, len 2: type_item [1] type_idx: 0
- 00 00
- // parsed: offset 348, len 2: type_item [2] type_idx: 0
- 00 00
- // parsed: offset 350, len 2: type_item [3] type_idx: 0
- 00 00
- // parsed: offset 352, len 2: type_item [4] type_idx: 0
- 00 00
-// parsed: offset 354, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 362, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 365, len 8: TYPE_STRING_DATA_ITEM [2] "LIIIII"
- 06 4C 49 49 49 49 49 00
-// parsed: offset 373, len 61: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_8;"
- 3B 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 2F 64 2F 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 38 3B 00
-// parsed: offset 434, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 454, len 27: TYPE_STRING_DATA_ITEM [5] "T_filled_new_array_8.java"
- 19 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 38 2E 6A 61 76 61 00
-// parsed: offset 481, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 484, len 4: TYPE_STRING_DATA_ITEM [7] "[I"
- 02 5B 49 00
-// parsed: offset 488, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_8;"
- // parsed: offset 493, len 1: static_fields_size: 0
- 00
- // parsed: offset 494, len 1: instance_fields_size: 0
- 00
- // parsed: offset 495, len 1: direct_methods_size: 1
- 01
- // parsed: offset 496, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 497, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 498, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 501, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 503, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 504, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 505, len 2: code_off: 312 (0x000138)
- B8 02
-// parsed: offset 507, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 508, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 512, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 524, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 536, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 548, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 560, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 572, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 584, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 596, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 608, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 354 (0x000162)
- 02 20 00 00 09 00 00 00 62 01 00 00
- // parsed: offset 620, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 493 (0x0001ed)
- 00 20 00 00 01 00 00 00 ED 01 00 00
- // parsed: offset 632, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 508 (0x0001fc)
- 00 10 00 00 01 00 00 00 FC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.d
deleted file mode 100644
index c7ba0ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2009 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_9.java
-.class public dot.junit.opcodes.filled_new_array.d.T_filled_new_array_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)[Ljava/lang/Object;
-.limit regs 10
- filled-new-array {v9}, [Ljava/lang/String;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.java
deleted file mode 100644
index 46cac1a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array.d;
-
-public class T_filled_new_array_9 {
- public Object[] run(Object a) {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/TestStubs.java
deleted file mode 100644
index 47b87e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/TestStubs.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range;
-
-// used by T_filled_new_array_range_11
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java
deleted file mode 100644
index 84b1379..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_1;
-import dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_10;
-import dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_11;
-import dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_2;
-
-public class Test_filled_new_array_range extends DxTestCase {
- /**
- * @title array of ints
- */
- public void testN1() {
- T_filled_new_array_range_1 t = new T_filled_new_array_range_1();
- int[] arr = t.run(1, 2, 3, 4, 5);
- assertNotNull(arr);
- assertEquals(5, arr.length);
- for(int i = 0; i < 5; i++)
- assertEquals(i + 1, arr[i]);
- }
-
- /**
- * @title array of objects
- */
- public void testN2() {
- T_filled_new_array_range_2 t = new T_filled_new_array_range_2();
- String s = "android";
- Object[] arr = t.run(t, s);
- assertNotNull(arr);
- assertEquals(2, arr.length);
- assertEquals(t, arr[0]);
- assertEquals(s, arr[1]);
- }
-
- /**
- * @constraint A18
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title try to pass obj ref instead of int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title try to pass long instead of int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title try to create non-array type
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title invalid arg count
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title attempt to instantiate String[] and fill it with reference to assignment-incompatible class
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_9");
- fail("expected a verification exception");
- } catch(Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title attempt to instantiate array of non-existent class
- */
- public void testVFE8() {
- T_filled_new_array_range_10 t = new T_filled_new_array_range_10();
- try {
- t.run();
- fail("expected NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title attempt to instantiate array of inaccessible class
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_11
- //@uses dot.junit.opcodes.filled_new_array_range.TestStubs
- T_filled_new_array_range_11 t = new T_filled_new_array_range_11();
- try {
- t.run();
- fail("expected IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.d
deleted file mode 100644
index 503c12a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_1.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array/range {v5..v9}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.java
deleted file mode 100644
index 6e69a23..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range.d;
-
-public class T_filled_new_array_range_1 {
- public int[] run(int a, int b, int c, int d, int e) {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.d
deleted file mode 100644
index 50a34b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2009 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_10.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[Ljava/lang/Object;
-.limit regs 10
- const v9, 0
- filled-new-array/range {v9}, [Ljava/lang/StringNNNNN;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.java
deleted file mode 100644
index 57075bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range.d;
-
-public class T_filled_new_array_range_10 {
- public Object[] run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.d
deleted file mode 100644
index e3a21e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2009 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_11.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[Ljava/lang/Object;
-.limit regs 10
- const v9, 0
- filled-new-array/range {v9}, [Ldot/junit/opcodes/filled_new_array_range/TestStubs;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.java
deleted file mode 100644
index f4ca611..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range.d;
-
-public class T_filled_new_array_range_11 {
- public Object[] run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.d
deleted file mode 100644
index 2b2ef15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_2.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)[Ljava/lang/Object;
-.limit regs 10
- filled-new-array/range {v8..v9}, [Ljava/lang/Object;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.java
deleted file mode 100644
index 51d1d32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range.d;
-
-public class T_filled_new_array_range_2 {
- public Object[] run(Object a, Object b) {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.d
deleted file mode 100644
index f8c25f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_3.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array/range {v5..v9}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.dfh
deleted file mode 100644
index 1a620e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.dex'...
-// Opened 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a199569d
- 9D 56 99 A1
-// parsed: offset 12, len 20: signature : 62a6...ef00
- 62 A6 E9 6F 30 02 D1 5F BB C2 AB 25 06 22 11 D4 FF 0B EF 00
-// parsed: offset 32, len 4: file_size : 624
- 70 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 488 (0x0001e8)
- E8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 376
- 78 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "LIIIII"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 333 (0x00014d) "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3;"
- 4D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 406 (0x000196) "Ljava/lang/Object;"
- 96 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 426 (0x0001aa) "T_filled_new_array_range_3.java"
- AA 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 459 (0x0001cb) "V"
- CB 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 462 (0x0001ce) "[I"
- CE 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 466 (0x0001d2) "run"
- D2 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 7 (0x000007) "[I"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 2 (0x000002) "LIIIII"
-// return_type_idx: 4 (0x000004) "[I"
-// parameters_off: 300 (0x00012c)
- 02 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_filled_new_array_range_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 471 (0x0001d7)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D7 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_3.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_3.run"
- // parsed: offset 272, len 2: registers_size: 10
- 0A 00
- // parsed: offset 274, len 2: ins_size: 6
- 06 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 288, len 6: |0000: filled-new-array/range {v5..v9}, [I // class@0004
-//@mod 25 05 04 00 05 00
- 25 05 04 01 05 00
- // parsed: offset 294, len 2: |0003: move-result-object v0
- 0C 00
- // parsed: offset 296, len 2: |0004: return-object v0
- 11 00
- // tries:
- // handlers:
-// parsed: offset 298, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 5
- 05 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
- // parsed: offset 308, len 2: type_item [2] type_idx: 0
- 00 00
- // parsed: offset 310, len 2: type_item [3] type_idx: 0
- 00 00
- // parsed: offset 312, len 2: type_item [4] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 8: TYPE_STRING_DATA_ITEM [2] "LIIIII"
- 06 4C 49 49 49 49 49 00
-// parsed: offset 333, len 73: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3;"
- 47 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 72 61 6E 67 65 2F 64 2F 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 72 61 6E 67 65 5F 33 3B 00
-// parsed: offset 406, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 426, len 33: TYPE_STRING_DATA_ITEM [5] "T_filled_new_array_range_3.java"
- 1F 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 72 61 6E 67 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 459, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 462, len 4: TYPE_STRING_DATA_ITEM [7] "[I"
- 02 5B 49 00
-// parsed: offset 466, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3;"
- // parsed: offset 471, len 1: static_fields_size: 0
- 00
- // parsed: offset 472, len 1: instance_fields_size: 0
- 00
- // parsed: offset 473, len 1: direct_methods_size: 1
- 01
- // parsed: offset 474, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 475, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 476, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 479, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 481, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 482, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 483, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 485, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 488, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 492, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 504, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 516, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 528, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 540, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 552, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 564, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 576, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 588, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 600, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 471 (0x0001d7)
- 00 20 00 00 01 00 00 00 D7 01 00 00
- // parsed: offset 612, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 488 (0x0001e8)
- 00 10 00 00 01 00 00 00 E8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4.d
deleted file mode 100644
index ab3d24e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_4.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array/range {v5..v10}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5.d
deleted file mode 100644
index 6781fa1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_5.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array/range {v4..v8}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6.d
deleted file mode 100644
index 33233b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_6.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIIJ)V
-.limit regs 11
- filled-new-array/range {v5..v9}, [I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7.d
deleted file mode 100644
index f60043a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_7.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array/range {v5..v9}, I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.d
deleted file mode 100644
index 7a93faf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_8.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IIIII)[I
-.limit regs 10
- filled-new-array/range {v5..v9}, [I
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.dfh
deleted file mode 100644
index c2696b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.dex'...
-// Opened 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 8d4c570b
- 0B 57 4C 8D
-// parsed: offset 12, len 20: signature : 0ab5...07fe
- 0A B5 95 25 DA 23 40 C1 99 88 9F D1 05 88 E3 24 5C 7C 07 FE
-// parsed: offset 32, len 4: file_size : 624
- 70 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 488 (0x0001e8)
- E8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 376
- 78 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "LIIIII"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 333 (0x00014d) "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8;"
- 4D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 406 (0x000196) "Ljava/lang/Object;"
- 96 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 426 (0x0001aa) "T_filled_new_array_range_8.java"
- AA 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 459 (0x0001cb) "V"
- CB 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 462 (0x0001ce) "[I"
- CE 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 466 (0x0001d2) "run"
- D2 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 7 (0x000007) "[I"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 2 (0x000002) "LIIIII"
-// return_type_idx: 4 (0x000004) "[I"
-// parameters_off: 300 (0x00012c)
- 02 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_filled_new_array_range_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 471 (0x0001d7)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D7 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_8.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_8.run"
- // parsed: offset 272, len 2: registers_size: 10
- 0A 00
- // parsed: offset 274, len 2: ins_size: 6
- 06 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 288, len 6: |0000: filled-new-array/range {v5..v9}, [I // class@0004
-//@mod 25 05 04 00 05 00
- 25 FF 04 00 05 00
- // parsed: offset 294, len 2: |0003: move-result-object v0
- 0C 00
- // parsed: offset 296, len 2: |0004: return-object v0
- 11 00
- // tries:
- // handlers:
-// parsed: offset 298, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 5
- 05 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
- // parsed: offset 308, len 2: type_item [2] type_idx: 0
- 00 00
- // parsed: offset 310, len 2: type_item [3] type_idx: 0
- 00 00
- // parsed: offset 312, len 2: type_item [4] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 8: TYPE_STRING_DATA_ITEM [2] "LIIIII"
- 06 4C 49 49 49 49 49 00
-// parsed: offset 333, len 73: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8;"
- 47 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 72 61 6E 67 65 2F 64 2F 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 72 61 6E 67 65 5F 38 3B 00
-// parsed: offset 406, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 426, len 33: TYPE_STRING_DATA_ITEM [5] "T_filled_new_array_range_8.java"
- 1F 54 5F 66 69 6C 6C 65 64 5F 6E 65 77 5F 61 72 72 61 79 5F 72 61 6E 67 65 5F 38 2E 6A 61 76 61 00
-// parsed: offset 459, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 462, len 4: TYPE_STRING_DATA_ITEM [7] "[I"
- 02 5B 49 00
-// parsed: offset 466, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8;"
- // parsed: offset 471, len 1: static_fields_size: 0
- 00
- // parsed: offset 472, len 1: instance_fields_size: 0
- 00
- // parsed: offset 473, len 1: direct_methods_size: 1
- 01
- // parsed: offset 474, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 475, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 476, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 479, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 481, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 482, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 483, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 485, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 488, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 492, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 504, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 516, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 528, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 540, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 552, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 564, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 576, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 588, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 600, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 471 (0x0001d7)
- 00 20 00 00 01 00 00 00 D7 01 00 00
- // parsed: offset 612, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 488 (0x0001e8)
- 00 10 00 00 01 00 00 00 E8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.d b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.d
deleted file mode 100644
index 4218cbe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2009 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_filled_new_array_range_9.java
-.class public dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)[Ljava/lang/Object;
-.limit regs 10
- filled-new-array/range {v9}, [Ljava/lang/String;
- move-result-object v0
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.java b/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.java
deleted file mode 100644
index 42ceba8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.filled_new_array_range.d;
-
-public class T_filled_new_array_range_9 {
- public void run() {
- return;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java
deleted file mode 100644
index 93b6df7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.float_to_double.d.T_float_to_double_1;
-import dot.junit.opcodes.float_to_double.d.T_float_to_double_7;
-
-public class Test_float_to_double extends DxTestCase {
- /**
- * @title Argument = 0.5
- */
- public void testN1() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertEquals(0.5d, t.run(0.5f), 0d);
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertEquals(1d, t.run(1), 0d);
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertEquals(-1d, t.run(-1), 0d);
- }
-
- /**
- * @title Type of argument - int. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of int to double makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_float_to_double_7 t = new T_float_to_double_7();
- try {
- t.run(1);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Float.MAX_VALUE
- */
- public void testB1() {
- T_float_to_double_1 t = new T_float_to_double_1();
- double r = 0x1.fffffeP+127d;
- assertEquals(r, t.run(Float.MAX_VALUE), 0d);
- }
-
- /**
- * @title Argument = Float.MIN_VALUE
- */
- public void testB2() {
- T_float_to_double_1 t = new T_float_to_double_1();
- double r = 0x0.000002P-126d;
- assertEquals(r, t.run(Float.MIN_VALUE), 0d);
- }
-
- /**
- * @title Argument = -0
- */
- public void testB3() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertEquals(-0d, t.run(-0), 0d);
- }
-
- /**
- * @title Argument = NaN
- */
- public void testB4() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertTrue(Double.isNaN(t.run(Float.NaN)));
- }
-
- /**
- * @title Argument = POSITIVE_INFINITY
- */
- public void testB5() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertTrue(Double.isInfinite(t.run(Float.POSITIVE_INFINITY)));
- }
-
- /**
- * @title Argument = NEGATIVE_INFINITY
- */
- public void testB6() {
- T_float_to_double_1 t = new T_float_to_double_1();
- assertTrue(Double.isInfinite(t.run(Float.NEGATIVE_INFINITY)));
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.d
deleted file mode 100644
index 0854de3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_1.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 6
-
- float-to-double v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.java
deleted file mode 100644
index c14f8aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_double.d;
-
-public class T_float_to_double_1 {
-
- public double run(float a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_2.d
deleted file mode 100644
index c37c547..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_2.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 6
-
- const-wide v2, 3.14
- float-to-double v0, v2
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_3.d
deleted file mode 100644
index 59217ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_3.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 6
-
- const-wide v2, 1223
- float-to-double v0, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_4.d
deleted file mode 100644
index 32f2b0a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_4.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()D
-.limit regs 1
-
- const v0, 3.14
- float-to-double v0, v0
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_5.d
deleted file mode 100644
index 77c3dc3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_5.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 6
-
- float-to-double v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_6.d
deleted file mode 100644
index eac86d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_6.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 6
-
- float-to-double v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.d
deleted file mode 100644
index 71f3c83..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_double_7.java
-.class public dot.junit.opcodes.float_to_double.d.T_float_to_double_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)D
-.limit regs 6
-
- float-to-double v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.java
deleted file mode 100644
index 9018914..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_double.d;
-
-public class T_float_to_double_7 {
-
- public double run(int a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java
deleted file mode 100644
index 27caeaa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.float_to_int.d.T_float_to_int_1;
-import dot.junit.opcodes.float_to_int.d.T_float_to_int_5;
-
-public class Test_float_to_int extends DxTestCase {
-
- /**
- * @title Argument = 2.999999f
- */
- public void testN1() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(2, t.run(2.999999f));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(1, t.run(1f));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(-1, t.run(-1f));
- }
-
- /**
- * @title Type of argument - int. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of int to int makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_float_to_int_5 t = new T_float_to_int_5();
- try {
- t.run(1);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = -0f
- */
- public void testB1() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(0, t.run(-0f));
- }
-
- /**
- * @title Argument = Float.MAX_VALUE
- */
- public void testB2() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Float.MAX_VALUE));
- }
-
- /**
- * @title Argument = Float.MIN_VALUE
- */
- public void testB3() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(0, t.run(Float.MIN_VALUE));
- }
-
- /**
- * @title Argument = NaN
- */
- public void testB4() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(0, t.run(Float.NaN));
- }
-
- /**
- * @title Argument = POSITIVE_INFINITY
- */
- public void testB5() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Argument = NEGATIVE_INFINITY
- */
- public void testB6() {
- T_float_to_int_1 t = new T_float_to_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Float.NEGATIVE_INFINITY));
- }
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.d
deleted file mode 100644
index 35f2eef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_int_1.java
-.class public dot.junit.opcodes.float_to_int.d.T_float_to_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- float-to-int v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.java
deleted file mode 100644
index b07cb68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_int.d;
-
-public class T_float_to_int_1 {
-
- public int run(float a) {
- return (int)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_2.d
deleted file mode 100644
index 61a8c4f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_int_2.java
-.class public dot.junit.opcodes.float_to_int.d.T_float_to_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- const-wide v1, 3.14
- float-to-int v0, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_3.d
deleted file mode 100644
index 0401ffd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_int_3.java
-.class public dot.junit.opcodes.float_to_int.d.T_float_to_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- const-wide v1, 1234
- float-to-int v0, v1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_4.d
deleted file mode 100644
index 94fb137..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_int_4.java
-.class public dot.junit.opcodes.float_to_int.d.T_float_to_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- float-to-int v0, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.d
deleted file mode 100644
index 697a193..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_int_5.java
-.class public dot.junit.opcodes.float_to_int.d.T_float_to_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- float-to-int v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.java
deleted file mode 100644
index 794d0d9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_int.d;
-
-public class T_float_to_int_5 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_6.d
deleted file mode 100644
index 6fa95c5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_int_6.java
-.class public dot.junit.opcodes.float_to_int.d.T_float_to_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- float-to-int v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java
deleted file mode 100644
index 97e2325..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.float_to_long.d.T_float_to_long_1;
-import dot.junit.opcodes.float_to_long.d.T_float_to_long_7;
-
-public class Test_float_to_long extends DxTestCase {
- /**
- * @title Argument = 2.999999f
- */
- public void testN1() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(2l, t.run(2.999999f));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(1l, t.run(1));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(-1l, t.run(-1));
- }
-
- /**
- * @title Type of argument - int. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of int to long makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_float_to_long_7 t = new T_float_to_long_7();
- try {
- t.run(1);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Float.MAX_VALUE
- */
- public void testB1() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(Long.MAX_VALUE, t.run(Float.MAX_VALUE));
- }
-
- /**
- * @title Argument = Float.MIN_VALUE
- */
- public void testB2() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(0, t.run(Float.MIN_VALUE));
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(0l, t.run(0));
- }
-
- /**
- * @title Argument = NaN
- */
- public void testB4() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(0l, t.run(Float.NaN));
- }
-
- /**
- * @title Argument = POSITIVE_INFINITY
- */
- public void testB5() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(Long.MAX_VALUE, t.run(Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Argument = NEGATIVE_INFINITY
- */
- public void testB6() {
- T_float_to_long_1 t = new T_float_to_long_1();
- assertEquals(Long.MIN_VALUE, t.run(Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @constraint B1
- * @title number of arguments
- */
- public void testVFE1() {
- try
- {
- Class.forName("dxc.junit.opcodes.float_to_long.jm.T_float_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE4() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE5() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.d
deleted file mode 100644
index a4a5c24..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_1.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 6
-
- float-to-long v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.java
deleted file mode 100644
index 667a37b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_long.d;
-
-public class T_float_to_long_1 {
-
- public long run(float a) {
- return (long)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_2.d
deleted file mode 100644
index ea3525a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_2.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 6
-
- const-wide v2, 3.14
- float-to-long v0, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_3.d
deleted file mode 100644
index 1fde1d8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_3.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 6
-
- const-wide v2, 1223
- float-to-long v0, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_4.d
deleted file mode 100644
index 69d1e57..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_4.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 1
-
- const v0, 3.14
- float-to-long v0, v0
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_5.d
deleted file mode 100644
index 148381a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_5.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 6
-
- float-to-long v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_6.d
deleted file mode 100644
index 99fa733..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_6.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 6
-
- float-to-long v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.d b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.d
deleted file mode 100644
index 30c969c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_float_to_long_7.java
-.class public dot.junit.opcodes.float_to_long.d.T_float_to_long_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 6
-
- float-to-long v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.java b/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.java
deleted file mode 100644
index 58ae745..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.float_to_long.d;
-
-public class T_float_to_long_7 {
-
- public long run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/Test_goto_16.java b/tools/vm-tests/src/dot/junit/opcodes/goto_16/Test_goto_16.java
deleted file mode 100644
index 2891fc4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/Test_goto_16.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.goto_16.d.T_goto_16_1;
-
-public class Test_goto_16 extends DxTestCase {
- /**
- * @title check forward and backward goto. This test also tests constraint C17 allowing to have
- * backward goto as a last opcode in the method.
- */
- public void testN1() {
- T_goto_16_1 t = new T_goto_16_1();
- assertEquals(0, t.run(20));
- }
-
- /**
- * @constraint A6
- * @title branch target is inside instruction
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.goto_16.d.T_goto_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.goto_16.d.T_goto_16_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title zero offset
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.goto_16.d.T_goto_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_1.d b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_1.d
deleted file mode 100644
index caa4ad0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_1.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_16_1.java
-.class public dot.junit.opcodes.goto_16.d.T_goto_16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-; test positive offset
- goto/16 Label2
-LabelReturn:
- return v4
-
-Label2:
- add-int/lit8 v4, v4, -1
- if-lez v4, LabelExit
-; test negative offset
- goto/16 Label2
-
-LabelExit:
- goto LabelReturn
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_1.java b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_1.java
deleted file mode 100644
index 381d04f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_16.d;
-
-public class T_goto_16_1 {
-
- public int run(int a) {
- while (a > 0) {
- a--;
- }
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.d b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.d
deleted file mode 100644
index 7162694..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_16_2.java
-.class public dot.junit.opcodes.goto_16.d.T_goto_16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto/16 Label2
-Label2:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.dfh b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.dfh
deleted file mode 100644
index 9e83d7f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_16/d/T_goto_16_2.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_16/d/T_goto_16_2.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : e5ec3c50
- 50 3C EC E5
-// parsed: offset 12, len 20: signature : 700a...7219
- 70 0A 71 39 79 DA 76 3F 7D B4 5A 82 07 EA 55 1E C7 F1 72 19
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "I"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 305 (0x000131) "II"
- 31 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 309 (0x000135) "Ldot/junit/opcodes/goto_16/d/T_goto_16_2;"
- 35 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 352 (0x000160) "Ljava/lang/Object;"
- 60 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 372 (0x000174) "T_goto_16_2.java"
- 74 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/goto_16/d/T_goto_16_2;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 288 (0x000120)
- 02 00 00 00 00 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/goto_16/d/T_goto_16_2;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_goto_16_2.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 398 (0x00018e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.goto_16.d.T_goto_16_2.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.goto_16.d.T_goto_16_2.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: goto/16 0004 // +0x0004
-//@mod 29 00 02 00
- 29 00 02 01
- // parsed: offset 284, len 2: |0002: return v4
- 0F 04
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 305, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 309, len 43: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/goto_16/d/T_goto_16_2;"
- 29 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 67 6F 74 6F 5F 31 36 2F 64 2F 54 5F 67 6F 74 6F 5F 31 36 5F 32 3B 00
-// parsed: offset 352, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 372, len 18: TYPE_STRING_DATA_ITEM [5] "T_goto_16_2.java"
- 10 54 5F 67 6F 74 6F 5F 31 36 5F 32 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/goto_16/d/T_goto_16_2;"
- // parsed: offset 398, len 1: static_fields_size: 0
- 00
- // parsed: offset 399, len 1: instance_fields_size: 0
- 00
- // parsed: offset 400, len 1: direct_methods_size: 1
- 01
- // parsed: offset 401, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 402, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 403, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 406, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 408, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 409, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 410, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 398 (0x00018e)
- 00 20 00 00 01 00 00 00 8E 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.java b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.java
deleted file mode 100644
index d9729a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_16.d;
-
-public class T_goto_16_2 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_3.d b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_3.d
deleted file mode 100644
index fcaa68d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_16_3.java
-.class public dot.junit.opcodes.goto_16.d.T_goto_16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto/16 Label2
-Label2:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_3.dfh
deleted file mode 100644
index 10045e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_3.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_16/d/T_goto_16_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_16/d/T_goto_16_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 77e43d0f
- 0F 3D E4 77
-// parsed: offset 12, len 20: signature : 8373...27f3
- 83 73 D6 CF 41 96 B2 D5 47 35 AB 73 18 04 6D FD 57 13 27 F3
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "I"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 305 (0x000131) "II"
- 31 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 309 (0x000135) "Ldot/junit/opcodes/goto_16/d/T_goto_16_3;"
- 35 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 352 (0x000160) "Ljava/lang/Object;"
- 60 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 372 (0x000174) "T_goto_16_3.java"
- 74 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/goto_16/d/T_goto_16_3;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 288 (0x000120)
- 02 00 00 00 00 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/goto_16/d/T_goto_16_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_goto_16_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 398 (0x00018e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.goto_16.d.T_goto_16_3.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.goto_16.d.T_goto_16_3.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: goto/16 0004 // +0x0004
-//@mod 29 00 02 00
- 29 00 03 00
- // parsed: offset 284, len 2: |0002: return v4
- 0F 04
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 305, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 309, len 43: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/goto_16/d/T_goto_16_3;"
- 29 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 67 6F 74 6F 5F 31 36 2F 64 2F 54 5F 67 6F 74 6F 5F 31 36 5F 33 3B 00
-// parsed: offset 352, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 372, len 18: TYPE_STRING_DATA_ITEM [5] "T_goto_16_3.java"
- 10 54 5F 67 6F 74 6F 5F 31 36 5F 33 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/goto_16/d/T_goto_16_3;"
- // parsed: offset 398, len 1: static_fields_size: 0
- 00
- // parsed: offset 399, len 1: instance_fields_size: 0
- 00
- // parsed: offset 400, len 1: direct_methods_size: 1
- 01
- // parsed: offset 401, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 402, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 403, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 406, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 408, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 409, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 410, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 398 (0x00018e)
- 00 20 00 00 01 00 00 00 8E 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.d b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.d
deleted file mode 100644
index 746c325..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_16_4.java
-.class public dot.junit.opcodes.goto_16.d.T_goto_16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto/16 Label1
-Label1:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.dfh
deleted file mode 100644
index 1b43042..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_16/d/T_goto_16_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_16/d/T_goto_16_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 5cce3b13
- 13 3B CE 5C
-// parsed: offset 12, len 20: signature : f804...031e
- F8 04 35 7B 64 32 AC 72 3D A1 7F 03 35 09 E1 77 49 DF 03 1E
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "I"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 305 (0x000131) "II"
- 31 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 309 (0x000135) "Ldot/junit/opcodes/goto_16/d/T_goto_16_4;"
- 35 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 352 (0x000160) "Ljava/lang/Object;"
- 60 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 372 (0x000174) "T_goto_16_4.java"
- 74 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/goto_16/d/T_goto_16_4;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 288 (0x000120)
- 02 00 00 00 00 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/goto_16/d/T_goto_16_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_goto_16_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 398 (0x00018e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.goto_16.d.T_goto_16_4.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.goto_16.d.T_goto_16_4.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: goto/16 0004 // +0x0004
-//@mod 29 00 02 00
- 29 00 00 00
- // parsed: offset 284, len 2: |0002: return v4
- 0F 04
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 305, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 309, len 43: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/goto_16/d/T_goto_16_4;"
- 29 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 67 6F 74 6F 5F 31 36 2F 64 2F 54 5F 67 6F 74 6F 5F 31 36 5F 34 3B 00
-// parsed: offset 352, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 372, len 18: TYPE_STRING_DATA_ITEM [5] "T_goto_16_4.java"
- 10 54 5F 67 6F 74 6F 5F 31 36 5F 34 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/goto_16/d/T_goto_16_4;"
- // parsed: offset 398, len 1: static_fields_size: 0
- 00
- // parsed: offset 399, len 1: instance_fields_size: 0
- 00
- // parsed: offset 400, len 1: direct_methods_size: 1
- 01
- // parsed: offset 401, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 402, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 403, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 406, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 408, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 409, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 410, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 398 (0x00018e)
- 00 20 00 00 01 00 00 00 8E 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.java b/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.java
deleted file mode 100644
index 4a087dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_16/d/T_goto_16_4.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_16.d;
-
-public class T_goto_16_4 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/Test_goto_32.java b/tools/vm-tests/src/dot/junit/opcodes/goto_32/Test_goto_32.java
deleted file mode 100644
index 5f7a4dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/Test_goto_32.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_32;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.goto_32.d.T_goto_32_1;
-
-public class Test_goto_32 extends DxTestCase {
- /**
- * @title check forward and backward goto. This test also tests constraint C17 allowing to have
- * backward goto as a last opcode in the method.
- */
- public void testN1() {
- T_goto_32_1 t = new T_goto_32_1();
- assertEquals(0, t.run(20));
- }
-
- /**
- * @constraint A6
- * @title branch target is inside instruction
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.goto_32.d.T_goto_32_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.goto_32.d.T_goto_32_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint n/a
- * @title zero offset - no exception expected
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.goto_32.d.T_goto_32_4");
- // no exception is expected
- } catch (Throwable t) {
- fail("not expected" + t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_1.d b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_1.d
deleted file mode 100644
index fd5335a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_1.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_32_1.java
-.class public dot.junit.opcodes.goto_32.d.T_goto_32_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-; test positive offset
- goto/32 Label2
-LabelReturn:
- return v4
-
-Label2:
- add-int/lit8 v4, v4, -1
- if-lez v4, LabelExit
-; test negative offset
- goto/32 Label2
-
-LabelExit:
- goto LabelReturn
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_1.java b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_1.java
deleted file mode 100644
index 90067e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_32.d;
-
-public class T_goto_32_1 {
-
- public int run(int a) {
- while (a > 0) {
- a--;
- }
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.d b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.d
deleted file mode 100644
index 1a76901..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_32_2.java
-.class public dot.junit.opcodes.goto_32.d.T_goto_32_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto/32 Label2
-Label2:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.dfh b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.dfh
deleted file mode 100644
index 4b28769..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.dfh
+++ /dev/null
@@ -1,260 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_32/d/T_goto_32_2.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_32/d/T_goto_32_2.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 66653ef5
- F5 3E 65 66
-// parsed: offset 12, len 20: signature : f397...b4a3
- F3 97 87 FB A7 9D A8 95 06 46 CD 7D 6B 68 DE D4 68 21 B4 A3
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "I"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 305 (0x000131) "II"
- 31 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 309 (0x000135) "Ldot/junit/opcodes/goto_32/d/T_goto_32_2;"
- 35 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 352 (0x000160) "Ljava/lang/Object;"
- 60 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 372 (0x000174) "T_goto_32_2.java"
- 74 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/goto_32/d/T_goto_32_2;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 288 (0x000120)
- 02 00 00 00 00 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/goto_32/d/T_goto_32_2;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_goto_32_2.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 398 (0x00018e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.goto_32.d.T_goto_32_2.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.goto_32.d.T_goto_32_2.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: goto/32 #0x00000003
-//@mod 2A 00 03 00 00 00
- 2A 00 03 00 00 10
- // parsed: offset 286, len 2: |0003: return v4
- 0F 04
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 305, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 309, len 43: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/goto_32/d/T_goto_32_2;"
- 29 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 67 6F 74 6F 5F 33 32 2F 64 2F 54 5F 67 6F 74 6F 5F 33 32 5F 32 3B 00
-// parsed: offset 352, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 372, len 18: TYPE_STRING_DATA_ITEM [5] "T_goto_32_2.java"
- 10 54 5F 67 6F 74 6F 5F 33 32 5F 32 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/goto_32/d/T_goto_32_2;"
- // parsed: offset 398, len 1: static_fields_size: 0
- 00
- // parsed: offset 399, len 1: instance_fields_size: 0
- 00
- // parsed: offset 400, len 1: direct_methods_size: 1
- 01
- // parsed: offset 401, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 402, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 403, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 406, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 408, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 409, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 410, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 398 (0x00018e)
- 00 20 00 00 01 00 00 00 8E 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.java b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.java
deleted file mode 100644
index 2f6d726..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.goto_32.d;
-
-public class T_goto_32_2 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_3.d b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_3.d
deleted file mode 100644
index 6130ae8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_32_3.java
-.class public dot.junit.opcodes.goto_32.d.T_goto_32_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto/32 Label2
-Label2:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_3.dfh
deleted file mode 100644
index 4d69427..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_3.dfh
+++ /dev/null
@@ -1,260 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_32/d/T_goto_32_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/goto_32/d/T_goto_32_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : d7f03cc2
- C2 3C F0 D7
-// parsed: offset 12, len 20: signature : 7597...1d22
- 75 97 05 E2 0A 6D AC B6 E0 92 5B 17 04 77 DE 99 7E F4 1D 22
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "I"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 305 (0x000131) "II"
- 31 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 309 (0x000135) "Ldot/junit/opcodes/goto_32/d/T_goto_32_3;"
- 35 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 352 (0x000160) "Ljava/lang/Object;"
- 60 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 372 (0x000174) "T_goto_32_3.java"
- 74 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/goto_32/d/T_goto_32_3;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 288 (0x000120)
- 02 00 00 00 00 00 00 00 20 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/goto_32/d/T_goto_32_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_goto_32_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 398 (0x00018e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.goto_32.d.T_goto_32_3.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.goto_32.d.T_goto_32_3.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: goto/32 #0x00000003
-//@mod 2A 00 03 00 00 00
- 2A 00 04 00 00 00
- // parsed: offset 286, len 2: |0003: return v4
- 0F 04
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 305, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 309, len 43: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/goto_32/d/T_goto_32_3;"
- 29 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 67 6F 74 6F 5F 33 32 2F 64 2F 54 5F 67 6F 74 6F 5F 33 32 5F 33 3B 00
-// parsed: offset 352, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 372, len 18: TYPE_STRING_DATA_ITEM [5] "T_goto_32_3.java"
- 10 54 5F 67 6F 74 6F 5F 33 32 5F 33 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/goto_32/d/T_goto_32_3;"
- // parsed: offset 398, len 1: static_fields_size: 0
- 00
- // parsed: offset 399, len 1: instance_fields_size: 0
- 00
- // parsed: offset 400, len 1: direct_methods_size: 1
- 01
- // parsed: offset 401, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 402, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 403, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 406, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 408, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 409, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 410, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 398 (0x00018e)
- 00 20 00 00 01 00 00 00 8E 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_4.d b/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_4.d
deleted file mode 100644
index 624dfaf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/goto_32/d/T_goto_32_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_goto_32_4.java
-.class public dot.junit.opcodes.goto_32.d.T_goto_32_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-Label1:
- goto/32 Label1
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/Test_if_eq.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/Test_if_eq.java
deleted file mode 100644
index ed9b9e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/Test_if_eq.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.if_eq;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_eq.d.T_if_eq_1;
-import dot.junit.opcodes.if_eq.d.T_if_eq_2;
-import dot.junit.opcodes.if_eq.d.T_if_eq_4;
-
-public class Test_if_eq extends DxTestCase {
-
- /**
- * @title Arguments = 5, 6
- */
- public void testN1() {
- T_if_eq_1 t = new T_if_eq_1();
- /*
- * Compare with 1234 to check that in case of failed comparison
- * execution proceeds at the address following if_eq instruction
- */
- assertEquals(1234, t.run(5, 6));
- }
-
- /**
- * @title Arguments = 0x0f0e0d0c, 0x0f0e0d0c
- */
- public void testN2() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1, t.run(0x0f0e0d0c, 0x0f0e0d0c));
- }
-
- /**
- * @title Arguments = 5, -5
- */
- public void testN3() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1234, t.run(5, -5));
- }
-
- /**
- * @title Arguments = 0x01001234, 0x1234
- */
- public void testN4() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1234, t.run(0x01001234, 0x1234));
- }
-
- /**
- * @title compare references
- */
- public void testN5() {
- T_if_eq_2 t = new T_if_eq_2();
- String a = "a";
- String b = "b";
- assertEquals(1234, t.run(a, b));
- }
-
- /**
- * @title compare references
- */
- public void testN6() {
- T_if_eq_2 t = new T_if_eq_2();
- String a = "a";
- assertEquals(1, t.run(a, a));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of int and float makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_if_eq_4 t = new T_if_eq_4();
- assertEquals(1234, t.run(1f, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 1234567
- */
- public void testB3() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1234, t.run(0, 1234567));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB4() {
- T_if_eq_1 t = new T_if_eq_1();
- assertEquals(1, t.run(0, 0));
- }
-
- /**
- * @title Compare reference with null
- */
- public void testB5() {
- T_if_eq_2 t = new T_if_eq_2();
- String a = "a";
- assertEquals(1234, t.run(null, a));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title zero offset
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.d
deleted file mode 100644
index b9e4603..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_1.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-eq v6, v7, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.java
deleted file mode 100644
index d9015d9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_1 {
-
- public int run(int a, int b) {
- return a == b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.d
deleted file mode 100644
index a7f0474..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_eq_10.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-eq v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.dfh
deleted file mode 100644
index d0c3c14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_eq/d/T_if_eq_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_eq/d/T_if_eq_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : ddba4029
- 29 40 BA DD
-// parsed: offset 12, len 20: signature : 888d...fb6f
- 88 8D 32 BC 19 C6 2A 6E 73 92 D4 07 A2 C9 A0 63 98 56 FB 6F
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_eq/d/T_if_eq_10;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_eq_10.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "V"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 399 (0x00018f) "Z"
- 8F 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 402 (0x000192) "ZII"
- 92 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_eq/d/T_if_eq_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_eq/d/T_if_eq_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_eq_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_eq.d.T_if_eq_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_eq.d.T_if_eq_10.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-eq v6, v7, 0004 // +0x0004
-//@mod 32 76 04 00
- 32 76 04 01
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: const/4 v6, #int 1 // #0x1
- 12 16
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_eq/d/T_if_eq_10;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 65 71 2F 64 2F 54 5F 69 66 5F 65 71 5F 31 30 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_eq_10.java"
- 0F 54 5F 69 66 5F 65 71 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 396, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 399, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 402, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_eq/d/T_if_eq_10;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.java
deleted file mode 100644
index 6350454..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_10 {
-
- public boolean run(int a, int b) {
- return a == b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.d
deleted file mode 100644
index f266a25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.d
+++ /dev/null
@@ -1,26 +0,0 @@
-.source T_if_eq_11.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)V
-.limit regs 8
-
- if-eq v6, v7, Label10
- const/4 v6, 0
- return-void
-
-Label10:
- const v6, 1
- nop
- nop
- const/4 v6, 1
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.dfh
deleted file mode 100644
index b0293d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_eq/d/T_if_eq_11.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_eq/d/T_if_eq_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : f79d4878
- 78 48 9D F7
-// parsed: offset 12, len 20: signature : f49a...1f2e
- F4 9A EE 46 B0 E3 E8 12 25 CB 9A BC D5 F7 87 9C F1 75 1F 2E
-// parsed: offset 32, len 4: file_size : 580
- 44 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 444 (0x0001bc)
- BC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 340
- 54 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 312 (0x000138) "<init>"
- 38 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 320 (0x000140) "Ldot/junit/opcodes/if_eq/d/T_if_eq_11;"
- 40 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 360 (0x000168) "Ljava/lang/Object;"
- 68 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 380 (0x00017c) "Ljava/lang/String;"
- 7C 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 400 (0x000190) "T_if_eq_11.java"
- 90 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 417 (0x0001a1) "V"
- A1 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 420 (0x0001a4) "VLL"
- A4 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 425 (0x0001a9) "run"
- A9 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/if_eq/d/T_if_eq_11;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/String;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "VLL"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 304 (0x000130)
- 06 00 00 00 03 00 00 00 30 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/if_eq/d/T_if_eq_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_eq_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 430 (0x0001ae)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 AE 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_eq.d.T_if_eq_11.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_eq.d.T_if_eq_11.run"
- // parsed: offset 264, len 2: registers_size: 8
- 08 00
- // parsed: offset 266, len 2: ins_size: 3
- 03 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 11
- 0B 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: if-eq v6, v7, 0004 // +0x0004
-//@mod 32 76 04 00
- 32 76 05 00
- // parsed: offset 284, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 286, len 2: |0003: return-void
- 0E 00
- // parsed: offset 288, len 6: |0004: const v6, #float 0.000000 // #0x00000001 int
- 14 06 01 00 00 00
- // parsed: offset 294, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 296, len 2: |0008: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0009: const/4 v6, #int 1 // #0x1
- 12 16
- // parsed: offset 300, len 2: |000a: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 302, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 304, len 4: size: 2
- 02 00 00 00
- // parsed: offset 308, len 2: type_item [0] type_idx: 2
- 02 00
- // parsed: offset 310, len 2: type_item [1] type_idx: 2
- 02 00
-// parsed: offset 312, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 320, len 40: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/if_eq/d/T_if_eq_11;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 65 71 2F 64 2F 54 5F 69 66 5F 65 71 5F 31 31 3B 00
-// parsed: offset 360, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 380, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 400, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_eq_11.java"
- 0F 54 5F 69 66 5F 65 71 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 417, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 420, len 5: TYPE_STRING_DATA_ITEM [6] "VLL"
- 03 56 4C 4C 00
-// parsed: offset 425, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_eq/d/T_if_eq_11;"
- // parsed: offset 430, len 1: static_fields_size: 0
- 00
- // parsed: offset 431, len 1: instance_fields_size: 0
- 00
- // parsed: offset 432, len 1: direct_methods_size: 1
- 01
- // parsed: offset 433, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 434, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 435, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 438, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 440, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 441, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 442, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 444, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 448, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 460, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 472, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 484, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 496, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 508, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 520, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 532, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 304 (0x000130)
- 01 10 00 00 01 00 00 00 30 01 00 00
- // parsed: offset 544, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 312 (0x000138)
- 02 20 00 00 08 00 00 00 38 01 00 00
- // parsed: offset 556, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 430 (0x0001ae)
- 00 20 00 00 01 00 00 00 AE 01 00 00
- // parsed: offset 568, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 444 (0x0001bc)
- 00 10 00 00 01 00 00 00 BC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.java
deleted file mode 100644
index 3c5f8fd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_11 {
-
- public boolean run(String a, String b) {
- return a == b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.d
deleted file mode 100644
index 9f0d34f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_12.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-eq v6, v7, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.dfh
deleted file mode 100644
index f327ba6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_eq/d/T_if_eq_12.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_eq/d/T_if_eq_12.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 48be3ebd
- BD 3E BE 48
-// parsed: offset 12, len 20: signature : 8ffe...1c12
- 8F FE A9 63 12 82 FD 99 23 44 02 D2 77 6A C4 D2 00 1A 1C 12
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 304 (0x000130) "<init>"
- 30 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 312 (0x000138) "I"
- 38 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 315 (0x00013b) "III"
- 3B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 320 (0x000140) "Ldot/junit/opcodes/if_eq/d/T_if_eq_12;"
- 40 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 360 (0x000168) "Ljava/lang/Object;"
- 68 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 380 (0x00017c) "T_if_eq_12.java"
- 7C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "run"
- 90 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/if_eq/d/T_if_eq_12;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "III"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 296 (0x000128)
- 02 00 00 00 00 00 00 00 28 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_eq/d/T_if_eq_12;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_if_eq_12.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 405 (0x000195)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 95 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_eq.d.T_if_eq_12.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_eq.d.T_if_eq_12.run"
- // parsed: offset 264, len 2: registers_size: 8
- 08 00
- // parsed: offset 266, len 2: ins_size: 3
- 03 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 7
- 07 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: if-eq v6, v7, 0005 // +0x0005
-//@mod 32 76 05 00
- 32 76 00 00
- // parsed: offset 284, len 4: |0002: const/16 v6, #int 1234 // #0x4d2
- 13 06 D2 04
- // parsed: offset 288, len 2: |0004: return v6
- 0F 06
- // parsed: offset 290, len 2: |0005: const/4 v6, #int 1 // #0x1
- 12 16
- // parsed: offset 292, len 2: |0006: goto 0004 // -0x0002
- 28 FE
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 296, len 4: size: 2
- 02 00 00 00
- // parsed: offset 300, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 302, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 304, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 312, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 315, len 5: TYPE_STRING_DATA_ITEM [2] "III"
- 03 49 49 49 00
-// parsed: offset 320, len 40: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/if_eq/d/T_if_eq_12;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 65 71 2F 64 2F 54 5F 69 66 5F 65 71 5F 31 32 3B 00
-// parsed: offset 360, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 380, len 17: TYPE_STRING_DATA_ITEM [5] "T_if_eq_12.java"
- 0F 54 5F 69 66 5F 65 71 5F 31 32 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_eq/d/T_if_eq_12;"
- // parsed: offset 405, len 1: static_fields_size: 0
- 00
- // parsed: offset 406, len 1: instance_fields_size: 0
- 00
- // parsed: offset 407, len 1: direct_methods_size: 1
- 01
- // parsed: offset 408, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 409, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 410, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 413, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 415, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 416, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 417, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 419, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 296 (0x000128)
- 01 10 00 00 01 00 00 00 28 01 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 304 (0x000130)
- 02 20 00 00 08 00 00 00 30 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 405 (0x000195)
- 00 20 00 00 01 00 00 00 95 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.d
deleted file mode 100644
index 239ef80..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_2.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)I
-.limit regs 8
-
- if-eq v6, v7, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.java
deleted file mode 100644
index 2e3f2e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_2 {
-
- public int run(String a, String b) {
- return a == b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.d
deleted file mode 100644
index 8cc6f7e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_eq_3.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- if-eq v6, v7, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.java
deleted file mode 100644
index e1d63c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_3 {
-
- public int run(float a, float b) {
- return a == b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.d
deleted file mode 100644
index 614b6b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_4.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- if-eq v6, v7, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.java
deleted file mode 100644
index 8a85025..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_4 {
-
- public int run(float a, int b) {
- return a == b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_5.d
deleted file mode 100644
index 94dd327..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_5.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_5.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-eq v6, v8, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.d
deleted file mode 100644
index 29f910b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_eq_6.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)I
-.limit regs 8
-
- if-eq v6, v8, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.java b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.java
deleted file mode 100644
index ab33d58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.if_eq.d;
-
-public class T_if_eq_6 {
-
- public boolean run(int a, int b) {
- return a == b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_7.d
deleted file mode 100644
index ded22b3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_7.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_7.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- if-eq v5, v6, Label11
- const/16 v5, 1234
-Label10:
- return v5
-
-Label11:
- const/4 v5, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_8.d
deleted file mode 100644
index 8e67f2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_8.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_8.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- if-eq v5, v7, Label11
- const/16 v5, 1234
-Label10:
- return v5
-
-Label11:
- const/4 v5, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_9.d
deleted file mode 100644
index b158878..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eq/d/T_if_eq_9.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eq_9.java
-.class public dot.junit.opcodes.if_eq.d.T_if_eq_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ILjava/lang/String;)I
-.limit regs 8
-
- if-eq v6, v7, Label11
- const/16 v6, 1234
-Label10:
- return v6
-
-Label11:
- const/4 v6, 1
- goto Label10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java
deleted file mode 100644
index 161ab3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package dot.junit.opcodes.if_eqz;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_eqz.d.T_if_eqz_1;
-import dot.junit.opcodes.if_eqz.d.T_if_eqz_2;
-import dot.junit.opcodes.if_eqz.d.T_if_eqz_3;
-import dot.junit.opcodes.if_eqz.d.T_if_eqz_4;
-
-public class Test_if_eqz extends DxTestCase {
-
- /**
- * @title Argument = 5 and -5
- */
- public void testN1() {
- T_if_eqz_1 t = new T_if_eqz_1();
- /*
- * Compare with 1234 to check that in case of failed comparison
- * execution proceeds at the address following if_acmpeq instruction
- */
- assertEquals(1234, t.run(5));
- assertEquals(1234, t.run(-5));
- }
-
- /**
- * @title Arguments = not null
- */
- public void testN2() {
- T_if_eqz_2 t = new T_if_eqz_2();
- String str = "abc";
- assertEquals(1234, t.run(str));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_if_eqz_3 t = new T_if_eqz_3();
- assertEquals(1234, t.run(3.123f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_eqz_1 t = new T_if_eqz_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_eqz_1 t = new T_if_eqz_1();
- assertEquals(1234, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE
- */
- public void testB3() {
- T_if_eqz_3 t = new T_if_eqz_3();
- assertEquals(1234, t.run(Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE
- */
- public void testB4() {
- T_if_eqz_3 t = new T_if_eqz_3();
- assertEquals(1234, t.run(Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0
- */
- public void testB5() {
- T_if_eqz_1 t = new T_if_eqz_1();
- assertEquals(1, t.run(0));
- }
-
- /**
- * @title Compare with null
- */
- public void testB6() {
- T_if_eqz_4 t = new T_if_eqz_4();
- assertEquals(1, t.run(null));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch must not be 0
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.d
deleted file mode 100644
index c44b870..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_1.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-eqz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.java
deleted file mode 100644
index 69d7ec5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eqz.d;
-
-public class T_if_eqz_1 {
-
- public int run(int a) {
- return a == 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.d
deleted file mode 100644
index 8c415d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_eqz_10.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-eqz v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- const v5, 0
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.dfh
deleted file mode 100644
index 8720c5e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.dfh
+++ /dev/null
@@ -1,278 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 13a54087
- 87 40 A5 13
-// parsed: offset 12, len 20: signature : f2ad...6186
- F2 AD 32 32 6C 56 2F 5F 0C 66 01 AD C1 B4 D3 5A E5 69 61 86
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_10;"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_eqz_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 405 (0x000195) "V"
- 95 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 408 (0x000198) "Z"
- 98 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 411 (0x00019b) "ZI"
- 9B 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_eqz_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_eqz.d.T_if_eqz_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_eqz.d.T_if_eqz_10.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-eqz v5, 0004 // +0x0004
-//@mod 38 05 04 00
- 38 05 05 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 6: |0004: const v5, #float 0.000000 // #0x00000000 int
- 14 05 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v5
- 0F 05
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 1
- 01 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_10;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 65 71 7A 2F 64 2F 54 5F 69 66 5F 65 71 7A 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_eqz_10.java"
- 10 54 5F 69 66 5F 65 71 7A 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 405, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 408, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 411, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.d
deleted file mode 100644
index af8ce95..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_eqz_11.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-eqz v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.dfh
deleted file mode 100644
index 9776e0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.dex'...
-// Opened '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 4c653f4a
- 4A 3F 65 4C
-// parsed: offset 12, len 20: signature : 64c4...a261
- 64 C4 0B 66 1A 5A 66 6E F4 C8 FA 14 8C 1E 4F 57 1F 9A A2 61
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_11;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_eqz_11.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 400 (0x000190) "Z"
- 90 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "ZI"
- 93 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_11;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_eqz_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_eqz.d.T_if_eqz_11.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_eqz.d.T_if_eqz_11.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-eqz v5, 0004 // +0x0004
-//@mod 38 05 04 00
- 38 05 00 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_11;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 65 71 7A 2F 64 2F 54 5F 69 66 5F 65 71 7A 5F 31 31 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_eqz_11.java"
- 10 54 5F 69 66 5F 65 71 7A 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 400, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 403, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_11;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.d
deleted file mode 100644
index 2b44068..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_2.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;)I
-.limit regs 6
-
- if-eqz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.java
deleted file mode 100644
index 288a1e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eqz.d;
-
-public class T_if_eqz_2 {
-
- public int run(String o) {
- return o == null ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.d
deleted file mode 100644
index 84e6924..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_3.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 6
-
- if-eqz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.java b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.java
deleted file mode 100644
index f328d0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eqz.d;
-
-public class T_if_eqz_3 {
-
- public int run(float o) {
- return o == 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.d
deleted file mode 100644
index 5d0c921..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_4.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)I
-.limit regs 6
-
- if-eqz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.java b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.java
deleted file mode 100644
index 5d83f7e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_eqz.d;
-
-public class T_if_eqz_4 {
-
- public int run(Object o) {
- return o == null ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_5.d
deleted file mode 100644
index 3ddc469..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_5.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)I
-.limit regs 6
-
- if-eqz v6, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_6.d
deleted file mode 100644
index ff120fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_6.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- if-eqz v6, Label9
- const/16 v6, 1234
- return v6
-
-Label9:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_7.d
deleted file mode 100644
index 2d2ccb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_7.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 6
-
- if-eqz v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.d
deleted file mode 100644
index 4ff0e6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_eqz_9.java
-.class public dot.junit.opcodes.if_eqz.d.T_if_eqz_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-eqz v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.dfh
deleted file mode 100644
index ee8a145..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 090e3d64
- 64 3D 0E 09
-// parsed: offset 12, len 20: signature : ca45...4c5d
- CA 45 28 5D 29 16 13 16 67 BC 32 35 F3 8A C7 62 46 28 4C 5D
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_9;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_eqz_9.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "V"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "Z"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "ZI"
- 91 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_eqz_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_eqz.d.T_if_eqz_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_eqz.d.T_if_eqz_9.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-eqz v5, 0004 // +0x0004
-//@mod 38 05 04 00
- 38 05 04 01
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_9;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 65 71 7A 2F 64 2F 54 5F 69 66 5F 65 71 7A 5F 39 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_eqz_9.java"
- 0F 54 5F 69 66 5F 65 71 7A 5F 39 2E 6A 61 76 61 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 398, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 401, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_eqz/d/T_if_eqz_9;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/Test_if_ge.java b/tools/vm-tests/src/dot/junit/opcodes/if_ge/Test_if_ge.java
deleted file mode 100644
index 5c22637..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/Test_if_ge.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package dot.junit.opcodes.if_ge;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_ge.d.T_if_ge_1;
-import dot.junit.opcodes.if_ge.d.T_if_ge_3;
-
-public class Test_if_ge extends DxTestCase {
-
- /**
- * @title Case: 5 < 6
- */
- public void testN1() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1234, t.run(5, 6));
- }
-
- /**
- * @title Case: 0x0f0e0d0c = 0x0f0e0d0c
- */
- public void testN2() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1, t.run(0x0f0e0d0c, 0x0f0e0d0c));
- }
-
- /**
- * @title Case: 5 > -5
- */
- public void testN3() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1, t.run(5, -5));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of int and float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_if_ge_3 t = new T_if_ge_3();
- assertEquals(1, t.run(1f, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1234, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB3() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, Integer.MIN_VALUE
- */
- public void testB4() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1, t.run(0, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_if_ge_1 t = new T_if_ge_1();
- assertEquals(1, t.run(0, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch target shall 0
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.d
deleted file mode 100644
index 1279bbe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_1.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-ge v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.java
deleted file mode 100644
index b507e37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ge.d;
-
-public class T_if_ge_1 {
-
- public int run(int a, int b) {
- return a >= b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.d
deleted file mode 100644
index d02659a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_ge_10.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-ge v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- const v6, 0
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.dfh
deleted file mode 100644
index 090fea5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_ge/d/T_if_ge_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_ge/d/T_if_ge_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 14003ffc
- FC 3F 00 14
-// parsed: offset 12, len 20: signature : b8fa...6526
- B8 FA D3 7A 8D D7 8E 82 0D 0E D1 33 C7 70 54 00 B1 30 65 26
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 316 (0x00013c) "<init>"
- 3C 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 324 (0x000144) "I"
- 44 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 327 (0x000147) "Ldot/junit/opcodes/if_ge/d/T_if_ge_10;"
- 47 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_ge_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 404 (0x000194) "V"
- 94 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 407 (0x000197) "Z"
- 97 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "ZII"
- 9A 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ge/d/T_if_ge_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ge/d/T_if_ge_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ge_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ge.d.T_if_ge_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ge.d.T_if_ge_10.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ge v6, v7, 0004 // +0x0004
-//@mod 35 76 04 00
- 35 76 05 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 6: |0004: const v6, #float 0.000000 // #0x00000000 int
- 14 06 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 2
- 02 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 314, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 316, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 324, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 327, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ge/d/T_if_ge_10;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 65 2F 64 2F 54 5F 69 66 5F 67 65 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ge_10.java"
- 0F 54 5F 69 66 5F 67 65 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 404, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 407, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ge/d/T_if_ge_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 316 (0x00013c)
- 02 20 00 00 09 00 00 00 3C 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.d
deleted file mode 100644
index 667364d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_ge_11.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-ge v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.dfh
deleted file mode 100644
index 730462e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_ge/d/T_if_ge_11.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_ge/d/T_if_ge_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 07f43ba4
- A4 3B F4 07
-// parsed: offset 12, len 20: signature : 0ddb...f74e
- 0D DB 24 02 D1 3C 3B 83 6B 43 22 39 49 49 55 12 39 79 F7 4E
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 304 (0x000130) "<init>"
- 30 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 312 (0x000138) "I"
- 38 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 315 (0x00013b) "III"
- 3B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 320 (0x000140) "Ldot/junit/opcodes/if_ge/d/T_if_ge_11;"
- 40 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 360 (0x000168) "Ljava/lang/Object;"
- 68 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 380 (0x00017c) "T_if_ge_11.java"
- 7C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "run"
- 90 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/if_ge/d/T_if_ge_11;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "III"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 296 (0x000128)
- 02 00 00 00 00 00 00 00 28 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ge/d/T_if_ge_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_if_ge_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 405 (0x000195)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 95 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ge.d.T_if_ge_11.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ge.d.T_if_ge_11.run"
- // parsed: offset 264, len 2: registers_size: 8
- 08 00
- // parsed: offset 266, len 2: ins_size: 3
- 03 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 7
- 07 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: if-ge v6, v7, 0005 // +0x0005
-//@mod 35 76 05 00
- 35 76 00 00
- // parsed: offset 284, len 4: |0002: const/16 v6, #int 1234 // #0x4d2
- 13 06 D2 04
- // parsed: offset 288, len 2: |0004: return v6
- 0F 06
- // parsed: offset 290, len 2: |0005: const/4 v6, #int 1 // #0x1
- 12 16
- // parsed: offset 292, len 2: |0006: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 296, len 4: size: 2
- 02 00 00 00
- // parsed: offset 300, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 302, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 304, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 312, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 315, len 5: TYPE_STRING_DATA_ITEM [2] "III"
- 03 49 49 49 00
-// parsed: offset 320, len 40: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/if_ge/d/T_if_ge_11;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 65 2F 64 2F 54 5F 69 66 5F 67 65 5F 31 31 3B 00
-// parsed: offset 360, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 380, len 17: TYPE_STRING_DATA_ITEM [5] "T_if_ge_11.java"
- 0F 54 5F 69 66 5F 67 65 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ge/d/T_if_ge_11;"
- // parsed: offset 405, len 1: static_fields_size: 0
- 00
- // parsed: offset 406, len 1: instance_fields_size: 0
- 00
- // parsed: offset 407, len 1: direct_methods_size: 1
- 01
- // parsed: offset 408, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 409, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 410, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 413, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 415, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 416, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 417, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 419, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 296 (0x000128)
- 01 10 00 00 01 00 00 00 28 01 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 304 (0x000130)
- 02 20 00 00 08 00 00 00 30 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 405 (0x000195)
- 00 20 00 00 01 00 00 00 95 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.d
deleted file mode 100644
index af33b07..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_ge_2.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- if-ge v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.java
deleted file mode 100644
index 64014ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.if_ge.d;
-
-public class T_if_ge_2 {
-
- public int run(float a, float b) {
- return a >= b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.d
deleted file mode 100644
index 876dcdc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_3.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- if-ge v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.java b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.java
deleted file mode 100644
index d524e1c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ge.d;
-
-public class T_if_ge_3 {
-
- public int run(float a, int b) {
- return a >= b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_4.d
deleted file mode 100644
index 3593702..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_4.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-ge v6, v8, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_5.d
deleted file mode 100644
index ddf627e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_5.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- if-ge v5, v6, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_6.d
deleted file mode 100644
index 74e3506..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_6.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- if-ge v5, v7, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_7.d
deleted file mode 100644
index b3559bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_7.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;I)I
-.limit regs 8
-
- if-ge v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.d
deleted file mode 100644
index 254da33..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ge_9.java
-.class public dot.junit.opcodes.if_ge.d.T_if_ge_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-ge v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.dfh
deleted file mode 100644
index 3f4b044..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_ge/d/T_if_ge_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_ge/d/T_if_ge_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c6b54091
- 91 40 B5 C6
-// parsed: offset 12, len 20: signature : a65c...e5f5
- A6 5C 79 D3 A9 EE BA 8C 74 66 B9 7A 38 6E 20 6C 12 E5 E5 F5
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_ge/d/T_if_ge_9;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_ge_9.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "Z"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "ZII"
- 90 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ge/d/T_if_ge_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ge/d/T_if_ge_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ge_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ge.d.T_if_ge_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ge.d.T_if_ge_9.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ge v6, v7, 0004 // +0x0004
-//@mod 35 76 04 00
- 35 76 04 01
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 39: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ge/d/T_if_ge_9;"
- 25 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 65 2F 64 2F 54 5F 69 66 5F 67 65 5F 39 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 16: TYPE_STRING_DATA_ITEM [4] "T_if_ge_9.java"
- 0E 54 5F 69 66 5F 67 65 5F 39 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ge/d/T_if_ge_9;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/Test_if_gez.java b/tools/vm-tests/src/dot/junit/opcodes/if_gez/Test_if_gez.java
deleted file mode 100644
index da97922..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/Test_if_gez.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package dot.junit.opcodes.if_gez;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_gez.d.T_if_gez_1;
-import dot.junit.opcodes.if_gez.d.T_if_gez_2;
-
-public class Test_if_gez extends DxTestCase {
-
- /**
- * @title Argument = 5
- */
- public void testN1() {
- T_if_gez_1 t = new T_if_gez_1();
- assertEquals(1, t.run(5));
- }
-
- /**
- * @title Argument = -5
- */
- public void testN2() {
- T_if_gez_1 t = new T_if_gez_1();
- assertEquals(1234, t.run(-5));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_if_gez_2 t = new T_if_gez_2();
- assertEquals(1, t.run(1.123f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_gez_1 t = new T_if_gez_1();
- assertEquals(1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_gez_1 t = new T_if_gez_1();
- assertEquals(1234, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0
- */
- public void testB3() {
- T_if_gez_1 t = new T_if_gez_1();
- assertEquals(1, t.run(0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch must not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.d
deleted file mode 100644
index 85145e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_1.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-gez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.java
deleted file mode 100644
index 462ed6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_gez.d;
-
-public class T_if_gez_1 {
-
- public int run(int a) {
- return a >= 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.d
deleted file mode 100644
index 503c0be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_10.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-gez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.dfh
deleted file mode 100644
index b4fa6dd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_gez/d/T_if_gez_10.dex'...
-// Opened '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_gez/d/T_if_gez_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 5d7e4122
- 22 41 7E 5D
-// parsed: offset 12, len 20: signature : 9bea...7f9b
- 9B EA D8 28 0E 81 13 A4 C2 E3 5E 59 A7 CC B3 E4 1A 47 7F 9B
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_gez/d/T_if_gez_10;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_gez_10.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 400 (0x000190) "Z"
- 90 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "ZI"
- 93 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gez/d/T_if_gez_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gez/d/T_if_gez_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gez_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gez.d.T_if_gez_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gez.d.T_if_gez_10.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gez v5, 0004 // +0x0004
-//@mod 3B 05 04 00
- 3B 05 00 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gez/d/T_if_gez_10;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 65 7A 2F 64 2F 54 5F 69 66 5F 67 65 7A 5F 31 30 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_gez_10.java"
- 10 54 5F 69 66 5F 67 65 7A 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 400, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 403, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gez/d/T_if_gez_10;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.d
deleted file mode 100644
index 3d0a858..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_2.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 6
-
- if-gez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.java
deleted file mode 100644
index 55d7605..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_gez.d;
-
-public class T_if_gez_2 {
-
- public int run(float a) {
- return a >= 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_3.d
deleted file mode 100644
index a4bda68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_3.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-gez v6, Label9
- const/16 v6, 1234
- return v6
-
-Label9:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_4.d
deleted file mode 100644
index 4a60845..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_4.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 6
-
- if-gez v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_5.d
deleted file mode 100644
index c3d88e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_5.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 6
-
- if-gez v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_6.d
deleted file mode 100644
index 666d59f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_6.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;)I
-.limit regs 6
-
- if-gez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_7.d
deleted file mode 100644
index 9534ba0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_7.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_gez_7.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-gez v0, Label9
- const/16 v0, 1234
- return v0
-
-Label9:
- const/4 v0, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.d
deleted file mode 100644
index f1df2d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gez_8.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-gez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.dfh
deleted file mode 100644
index 307f59d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_gez/d/T_if_gez_8.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_gez/d/T_if_gez_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 743e41c9
- C9 41 3E 74
-// parsed: offset 12, len 20: signature : 8137...c1a7
- 81 37 BE DD 96 E5 E3 AE 8E C3 09 D0 A5 41 3C 1A AC EC C1 A7
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_gez/d/T_if_gez_8;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_gez_8.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "V"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "Z"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "ZI"
- 91 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gez/d/T_if_gez_8;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gez/d/T_if_gez_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gez_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gez.d.T_if_gez_8.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gez.d.T_if_gez_8.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gez v5, 0004 // +0x0004
-//@mod 3B 05 04 00
- 3B 05 04 01
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gez/d/T_if_gez_8;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 65 7A 2F 64 2F 54 5F 69 66 5F 67 65 7A 5F 38 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_gez_8.java"
- 0F 54 5F 69 66 5F 67 65 7A 5F 38 2E 6A 61 76 61 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 398, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 401, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gez/d/T_if_gez_8;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.d
deleted file mode 100644
index a0b7545..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_gez_9.java
-.class public dot.junit.opcodes.if_gez.d.T_if_gez_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-gez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- const v5, 0
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.dfh
deleted file mode 100644
index 4c24707..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_gez/d/T_if_gez_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_gez/d/T_if_gez_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : f5534081
- 81 40 53 F5
-// parsed: offset 12, len 20: signature : 01ee...5008
- 01 EE F6 9D DC E2 4D 51 1B 8B 52 BC 5D A5 3C 9C 1B F0 50 08
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "Ldot/junit/opcodes/if_gez/d/T_if_gez_9;"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 366 (0x00016e) "Ljava/lang/Object;"
- 6E 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 386 (0x000182) "T_if_gez_9.java"
- 82 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 403 (0x000193) "V"
- 93 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 406 (0x000196) "Z"
- 96 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 409 (0x000199) "ZI"
- 99 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 413 (0x00019d) "run"
- 9D 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gez/d/T_if_gez_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gez/d/T_if_gez_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gez_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 418 (0x0001a2)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A2 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gez.d.T_if_gez_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gez.d.T_if_gez_9.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gez v5, 0004 // +0x0004
-//@mod 3B 05 04 00
- 3B 05 05 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 6: |0004: const v5, #float 0.000000 // #0x00000000 int
- 14 05 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v5
- 0F 05
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 1
- 01 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gez/d/T_if_gez_9;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 65 7A 2F 64 2F 54 5F 69 66 5F 67 65 7A 5F 39 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 386, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_gez_9.java"
- 0F 54 5F 69 66 5F 67 65 7A 5F 39 2E 6A 61 76 61 00
-// parsed: offset 403, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 406, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 409, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 413, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gez/d/T_if_gez_9;"
- // parsed: offset 418, len 1: static_fields_size: 0
- 00
- // parsed: offset 419, len 1: instance_fields_size: 0
- 00
- // parsed: offset 420, len 1: direct_methods_size: 1
- 01
- // parsed: offset 421, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 423, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 426, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 428, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 429, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 430, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 418 (0x0001a2)
- 00 20 00 00 01 00 00 00 A2 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/Test_if_gt.java b/tools/vm-tests/src/dot/junit/opcodes/if_gt/Test_if_gt.java
deleted file mode 100644
index 862ba4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/Test_if_gt.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package dot.junit.opcodes.if_gt;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_gt.d.T_if_gt_1;
-import dot.junit.opcodes.if_gt.d.T_if_gt_3;
-
-public class Test_if_gt extends DxTestCase {
-
- /**
- * @title Case: 5 < 6
- */
- public void testN1() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1234, t.run(5, 6));
- }
-
- /**
- * @title Case: 0x0f0e0d0c = 0x0f0e0d0c
- */
- public void testN2() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1234, t.run(0x0f0e0d0c, 0x0f0e0d0c));
- }
-
- /**
- * @title Case: 5 > -5
- */
- public void testN3() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1, t.run(5, -5));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of int and float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_if_gt_3 t = new T_if_gt_3();
- assertEquals(1, t.run(1f, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1234, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB3() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, Integer.MIN_VALUE
- */
- public void testB4() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1, t.run(0, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_if_gt_1 t = new T_if_gt_1();
- assertEquals(1234, t.run(0, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch target shall not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.d
deleted file mode 100644
index 293c1ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_1.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.java
deleted file mode 100644
index b71142f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_gt.d;
-
-public class T_if_gt_1 {
-
- public int run(int a, int b) {
- return a > b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.d
deleted file mode 100644
index 7dd9ab7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_gt_10.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/4 v6, 0
- return v6
-
-Label11:
- const v6, 0
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.dfh
deleted file mode 100644
index 6d0aaad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_gt/d/T_if_gt_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_gt/d/T_if_gt_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 0e2c42e5
- E5 42 2C 0E
-// parsed: offset 12, len 20: signature : eb64...07d7
- EB 64 9E 9B AE C0 F1 D7 E7 75 AE 37 77 BF 2B BB 7A D1 07 D7
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 316 (0x00013c) "<init>"
- 3C 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 324 (0x000144) "I"
- 44 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 327 (0x000147) "Ldot/junit/opcodes/if_gt/d/T_if_gt_10;"
- 47 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_gt_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 404 (0x000194) "V"
- 94 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 407 (0x000197) "Z"
- 97 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "ZII"
- 9A 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gt/d/T_if_gt_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gt/d/T_if_gt_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gt_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gt.d.T_if_gt_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gt.d.T_if_gt_10.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gt v6, v7, 0004 // +0x0004
-//@mod 36 76 04 00
- 36 76 05 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 6: |0004: const v6, #float 0.000000 // #0x00000000 int
- 14 06 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 2
- 02 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 314, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 316, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 324, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 327, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gt/d/T_if_gt_10;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 74 2F 64 2F 54 5F 69 66 5F 67 74 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_gt_10.java"
- 0F 54 5F 69 66 5F 67 74 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 404, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 407, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gt/d/T_if_gt_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 316 (0x00013c)
- 02 20 00 00 09 00 00 00 3C 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.d
deleted file mode 100644
index 13fa794..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_gt_11.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.dfh
deleted file mode 100644
index 9822137..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.dfh
+++ /dev/null
@@ -1,278 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_gt/d/T_if_gt_11.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_gt/d/T_if_gt_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 6c2e423c
- 3C 42 2E 6C
-// parsed: offset 12, len 20: signature : 5443...b674
- 54 43 D6 BD FA E8 4D 02 23 47 91 E4 D9 A6 90 BB B7 BD B6 74
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 312 (0x000138) "<init>"
- 38 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 320 (0x000140) "F"
- 40 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 323 (0x000143) "I"
- 43 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 326 (0x000146) "IFF"
- 46 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 331 (0x00014b) "Ldot/junit/opcodes/if_gt/d/T_if_gt_11;"
- 4B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 371 (0x000173) "Ljava/lang/Object;"
- 73 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 391 (0x000187) "T_if_gt_11.java"
- 87 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 408 (0x000198) "V"
- 98 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 411 (0x00019b) "run"
- 9B 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "F"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "I"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ldot/junit/opcodes/if_gt/d/T_if_gt_11;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "Ljava/lang/Object;"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 7 (0x000007) "V"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 3 (0x000003) "IFF"
-// return_type_idx: 1 (0x000001) "I"
-// parameters_off: 304 (0x000130)
- 03 00 00 00 01 00 00 00 30 01 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "V"
-// return_type_idx: 4 (0x000004) "V"
-// parameters_off: 0 (0x000000)
- 07 00 00 00 04 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 8 (0x000008) "run"
- 02 00 00 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 3 (0x000003) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 03 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 2 "Ldot/junit/opcodes/if_gt/d/T_if_gt_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 3 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 6 "T_if_gt_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 416 (0x0001a0)
-// static_values_off: 0 (0x000000)
- 02 00 00 00 01 00 00 00 03 00 00 00 00 00 00 00 06 00 00 00 00 00 00 00 A0 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gt.d.T_if_gt_11.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gt.d.T_if_gt_11.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 7
- 07 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gt v6, v7, 0005 // +0x0005
-//@mod 36 76 05 00
- 36 76 00 00
- // parsed: offset 292, len 4: |0002: const/16 v6, #int 1234 // #0x4d2
- 13 06 D2 04
- // parsed: offset 296, len 2: |0004: return v6
- 0F 06
- // parsed: offset 298, len 2: |0005: const/4 v6, #int 1 // #0x1
- 12 16
- // parsed: offset 300, len 2: |0006: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 302, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 304, len 4: size: 2
- 02 00 00 00
- // parsed: offset 308, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 310, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 312, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 320, len 3: TYPE_STRING_DATA_ITEM [1] "F"
- 01 46 00
-// parsed: offset 323, len 3: TYPE_STRING_DATA_ITEM [2] "I"
- 01 49 00
-// parsed: offset 326, len 5: TYPE_STRING_DATA_ITEM [3] "IFF"
- 03 49 46 46 00
-// parsed: offset 331, len 40: TYPE_STRING_DATA_ITEM [4] "Ldot/junit/opcodes/if_gt/d/T_if_gt_11;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 74 2F 64 2F 54 5F 69 66 5F 67 74 5F 31 31 3B 00
-// parsed: offset 371, len 20: TYPE_STRING_DATA_ITEM [5] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 391, len 17: TYPE_STRING_DATA_ITEM [6] "T_if_gt_11.java"
- 0F 54 5F 69 66 5F 67 74 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 408, len 3: TYPE_STRING_DATA_ITEM [7] "V"
- 01 56 00
-// parsed: offset 411, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gt/d/T_if_gt_11;"
- // parsed: offset 416, len 1: static_fields_size: 0
- 00
- // parsed: offset 417, len 1: instance_fields_size: 0
- 00
- // parsed: offset 418, len 1: direct_methods_size: 1
- 01
- // parsed: offset 419, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 421, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 424, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 426, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 427, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 428, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 430, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 304 (0x000130)
- 01 10 00 00 01 00 00 00 30 01 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 312 (0x000138)
- 02 20 00 00 09 00 00 00 38 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 416 (0x0001a0)
- 00 20 00 00 01 00 00 00 A0 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.d
deleted file mode 100644
index 30e3b81..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_gt_2.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.java
deleted file mode 100644
index 136d619..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.if_gt.d;
-
-public class T_if_gt_2 {
-
- public int run(float a, float b) {
- return a > b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.d
deleted file mode 100644
index 75d4d17..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_3.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.java b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.java
deleted file mode 100644
index 9d53767..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_gt.d;
-
-public class T_if_gt_3 {
-
- public int run(float a, int b) {
- return a > b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_4.d
deleted file mode 100644
index f1ebef1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_4.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-gt v7, v8, Label11
- const/16 v7, 1234
- return v7
-
-Label11:
- const/4 v7, 1
- return v7
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_5.d
deleted file mode 100644
index 829291b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_5.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- if-gt v5, v6, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_6.d
deleted file mode 100644
index 39b3541..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_6.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- if-gt v5, v7, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_7.d
deleted file mode 100644
index 88b8364..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_7.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;I)I
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_8.d
deleted file mode 100644
index 8325322..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_8.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_gt_8.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-gt v6, v0, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.d
deleted file mode 100644
index 198d870..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gt_9.java
-.class public dot.junit.opcodes.if_gt.d.T_if_gt_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-gt v6, v7, Label11
- const/4 v6, 0
- return v6
-
-Label11:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.dfh
deleted file mode 100644
index a9549db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_gt/d/T_if_gt_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_gt/d/T_if_gt_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c6c73e51
- 51 3E C7 C6
-// parsed: offset 12, len 20: signature : e023...c1e9
- E0 23 56 87 13 06 4B 95 E5 A7 64 7B 18 5C 6F 2D BC 12 C1 E9
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_gt/d/T_if_gt_9;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_gt_9.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "Z"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "ZII"
- 90 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gt/d/T_if_gt_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gt/d/T_if_gt_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gt_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gt.d.T_if_gt_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gt.d.T_if_gt_9.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gt v6, v7, 0004 // +0x0004
-//@mod 36 76 04 00
- 36 76 04 01
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 39: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gt/d/T_if_gt_9;"
- 25 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 74 2F 64 2F 54 5F 69 66 5F 67 74 5F 39 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 16: TYPE_STRING_DATA_ITEM [4] "T_if_gt_9.java"
- 0E 54 5F 69 66 5F 67 74 5F 39 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gt/d/T_if_gt_9;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java
deleted file mode 100644
index 86a5535..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package dot.junit.opcodes.if_gtz;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_gtz.d.T_if_gtz_1;
-import dot.junit.opcodes.if_gtz.d.T_if_gtz_2;
-
-public class Test_if_gtz extends DxTestCase {
-
- /**
- * @title Argument = 5
- */
- public void testN1() {
- T_if_gtz_1 t = new T_if_gtz_1();
- assertEquals(1, t.run(5));
- }
-
- /**
- * @title Argument = -5
- */
- public void testN2() {
- T_if_gtz_1 t = new T_if_gtz_1();
- assertEquals(1234, t.run(-5));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_if_gtz_2 t = new T_if_gtz_2();
- assertEquals(1, t.run(1.123f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_gtz_1 t = new T_if_gtz_1();
- assertEquals(1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_gtz_1 t = new T_if_gtz_1();
- assertEquals(1234, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0
- */
- public void testB3() {
- T_if_gtz_1 t = new T_if_gtz_1();
- assertEquals(1234, t.run(0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch must not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.d
deleted file mode 100644
index 2207436..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_1.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-gtz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.java
deleted file mode 100644
index cca881f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_gtz.d;
-
-public class T_if_gtz_1 {
-
- public int run(int a) {
- return a > 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.d
deleted file mode 100644
index 4119a6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_gtz_10.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-gtz v5, Label8
- const/4 v0, 0
- return v0
-
-Label8:
- nop
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.dfh
deleted file mode 100644
index 5007f63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.dfh
+++ /dev/null
@@ -1,278 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 63564126
- 26 41 56 63
-// parsed: offset 12, len 20: signature : a735...e471
- A7 35 3A 24 84 99 A8 9A B8 55 11 8C 64 FC 37 6F C2 8A E4 71
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_10;"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_gtz_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 405 (0x000195) "V"
- 95 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 408 (0x000198) "Z"
- 98 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 411 (0x00019b) "ZI"
- 9B 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gtz_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gtz.d.T_if_gtz_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gtz.d.T_if_gtz_10.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gtz v5, 0004 // +0x0004
-//@mod 3C 05 04 00
- 3C 05 00 00
- // parsed: offset 292, len 2: |0002: const/4 v0, #int 0 // #0x0
- 12 00
- // parsed: offset 294, len 2: |0003: return v0
- 0F 00
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 6: |0005: const v0, #float 0.000000 // #0x00000000 int
- 14 00 00 00 00 00
- // parsed: offset 304, len 2: |0008: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 1
- 01 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_10;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 74 7A 2F 64 2F 54 5F 69 66 5F 67 74 7A 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_gtz_10.java"
- 10 54 5F 69 66 5F 67 74 7A 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 405, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 408, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 411, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.d
deleted file mode 100644
index b57c6ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_2.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 6
-
- if-gtz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.java
deleted file mode 100644
index ea1def0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_gtz.d;
-
-public class T_if_gtz_2 {
-
- public int run(float a) {
- return a > 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_3.d
deleted file mode 100644
index c2db4b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_3.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-gtz v6, Label9
- const/16 v6, 1234
- return v6
-
-Label9:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_4.d
deleted file mode 100644
index 98e01e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_4.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 6
-
- if-gtz v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_5.d
deleted file mode 100644
index 29f8800..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_5.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 6
-
- if-gtz v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_6.d
deleted file mode 100644
index a91668e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_6.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;)I
-.limit regs 6
-
- if-gtz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_7.d
deleted file mode 100644
index 71a5bfc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_7.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_gtz_7.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-gtz v0, Label9
- const/16 v0, 1234
- return v0
-
-Label9:
- const/4 v0, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.d
deleted file mode 100644
index 5bf3d9c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_gtz_8.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-gtz v5, Label8
- const/4 v0, 0
- return v0
-
-Label8:
- nop
- const/4 v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.dfh
deleted file mode 100644
index 2af60bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 00484033
- 33 40 48 00
-// parsed: offset 12, len 20: signature : d58a...b651
- D5 8A 12 27 F2 10 E0 5C 52 C9 68 FB 6C 6D 37 15 4D E8 B6 51
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 310 (0x000136) "<init>"
- 36 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 318 (0x00013e) "I"
- 3E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 321 (0x000141) "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_8;"
- 41 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 362 (0x00016a) "Ljava/lang/Object;"
- 6A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 382 (0x00017e) "T_if_gtz_8.java"
- 7E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 399 (0x00018f) "V"
- 8F 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 402 (0x000192) "Z"
- 92 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 405 (0x000195) "ZI"
- 95 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 409 (0x000199) "run"
- 99 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_8;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 304 (0x000130)
- 07 00 00 00 04 00 00 00 30 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gtz_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 414 (0x00019e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gtz.d.T_if_gtz_8.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gtz.d.T_if_gtz_8.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 7
- 07 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gtz v5, 0004 // +0x0004
-//@mod 3C 05 04 00
- 3C 05 04 01
- // parsed: offset 292, len 2: |0002: const/4 v0, #int 0 // #0x0
- 12 00
- // parsed: offset 294, len 2: |0003: return v0
- 0F 00
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: const/4 v0, #int 0 // #0x0
- 12 00
- // parsed: offset 300, len 2: |0006: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 302, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 304, len 4: size: 1
- 01 00 00 00
- // parsed: offset 308, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 310, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 318, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 321, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_8;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 74 7A 2F 64 2F 54 5F 69 66 5F 67 74 7A 5F 38 3B 00
-// parsed: offset 362, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 382, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_gtz_8.java"
- 0F 54 5F 69 66 5F 67 74 7A 5F 38 2E 6A 61 76 61 00
-// parsed: offset 399, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 402, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 405, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 409, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_8;"
- // parsed: offset 414, len 1: static_fields_size: 0
- 00
- // parsed: offset 415, len 1: instance_fields_size: 0
- 00
- // parsed: offset 416, len 1: direct_methods_size: 1
- 01
- // parsed: offset 417, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 419, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 422, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 425, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 426, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 304 (0x000130)
- 01 10 00 00 01 00 00 00 30 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 310 (0x000136)
- 02 20 00 00 09 00 00 00 36 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 414 (0x00019e)
- 00 20 00 00 01 00 00 00 9E 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.d
deleted file mode 100644
index 08e8ff9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_gtz_9.java
-.class public dot.junit.opcodes.if_gtz.d.T_if_gtz_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-gtz v5, Label8
- const/4 v0, 0
- return v0
-
-Label8:
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.dfh
deleted file mode 100644
index 1c600fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 910f41e3
- E3 41 0F 91
-// parsed: offset 12, len 20: signature : 897e...e923
- 89 7E 66 D4 A6 63 A4 C3 FF C5 35 EC 5B 7C 65 85 1B E2 E9 23
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 310 (0x000136) "<init>"
- 36 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 318 (0x00013e) "I"
- 3E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 321 (0x000141) "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_9;"
- 41 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 362 (0x00016a) "Ljava/lang/Object;"
- 6A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 382 (0x00017e) "T_if_gtz_9.java"
- 7E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 399 (0x00018f) "V"
- 8F 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 402 (0x000192) "Z"
- 92 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 405 (0x000195) "ZI"
- 95 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 409 (0x000199) "run"
- 99 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 304 (0x000130)
- 07 00 00 00 04 00 00 00 30 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_gtz_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 414 (0x00019e)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9E 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_gtz.d.T_if_gtz_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_gtz.d.T_if_gtz_9.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-gtz v5, 0004 // +0x0004
-//@mod 3C 05 04 00
- 3C 05 05 00
- // parsed: offset 292, len 2: |0002: const/4 v0, #int 0 // #0x0
- 12 00
- // parsed: offset 294, len 2: |0003: return v0
- 0F 00
- // parsed: offset 296, len 6: |0004: const v0, #float 0.000000 // #0x00000000 int
- 14 00 00 00 00 00
- // parsed: offset 302, len 2: |0007: return v0
- 0F 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 304, len 4: size: 1
- 01 00 00 00
- // parsed: offset 308, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 310, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 318, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 321, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_9;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 67 74 7A 2F 64 2F 54 5F 69 66 5F 67 74 7A 5F 39 3B 00
-// parsed: offset 362, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 382, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_gtz_9.java"
- 0F 54 5F 69 66 5F 67 74 7A 5F 39 2E 6A 61 76 61 00
-// parsed: offset 399, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 402, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 405, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 409, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_gtz/d/T_if_gtz_9;"
- // parsed: offset 414, len 1: static_fields_size: 0
- 00
- // parsed: offset 415, len 1: instance_fields_size: 0
- 00
- // parsed: offset 416, len 1: direct_methods_size: 1
- 01
- // parsed: offset 417, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 419, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 422, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 425, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 426, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 304 (0x000130)
- 01 10 00 00 01 00 00 00 30 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 310 (0x000136)
- 02 20 00 00 09 00 00 00 36 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 414 (0x00019e)
- 00 20 00 00 01 00 00 00 9E 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/Test_if_le.java b/tools/vm-tests/src/dot/junit/opcodes/if_le/Test_if_le.java
deleted file mode 100644
index 852324b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/Test_if_le.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package dot.junit.opcodes.if_le;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_le.d.T_if_le_1;
-import dot.junit.opcodes.if_le.d.T_if_le_11;
-
-public class Test_if_le extends DxTestCase {
-
- /**
- * @title Case: 5 < 6
- */
- public void testN1() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1, t.run(5, 6));
- }
-
- /**
- * @title Case: 0x0f0e0d0c = 0x0f0e0d0c
- */
- public void testN2() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1, t.run(0x0f0e0d0c, 0x0f0e0d0c));
- }
-
- /**
- * @title Case: 5 > -5
- */
- public void testN3() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1234, t.run(5, -5));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of int and float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_if_le_11 t = new T_if_le_11();
- assertEquals(1, t.run(1, 1f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB3() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, Integer.MIN_VALUE
- */
- public void testB4() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1234, t.run(0, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_if_le_1 t = new T_if_le_1();
- assertEquals(1, t.run(0, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch target shall not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_1.d
deleted file mode 100644
index a9fbd14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_1.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-le v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_1.java
deleted file mode 100644
index 65d5da6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_le.d;
-
-public class T_if_le_1 {
-
- public int run(int a, int b) {
- return a <= b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_10.d
deleted file mode 100644
index 7c9ca12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_le_10.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-le v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- const v6, 0
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_10.dfh
deleted file mode 100644
index 9c55965..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_10.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_le/d/T_if_le_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_le/d/T_if_le_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 0713407a
- 7A 40 13 07
-// parsed: offset 12, len 20: signature : eb53...56c4
- EB 53 CD DC C5 02 DC 05 C8 B3 F8 3D 81 26 1E 13 2F 96 56 C4
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 316 (0x00013c) "<init>"
- 3C 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 324 (0x000144) "I"
- 44 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 327 (0x000147) "Ldot/junit/opcodes/if_le/d/T_if_le_10;"
- 47 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_le_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 404 (0x000194) "V"
- 94 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 407 (0x000197) "Z"
- 97 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "ZII"
- 9A 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_le/d/T_if_le_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_le/d/T_if_le_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_le_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_le.d.T_if_le_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_le.d.T_if_le_10.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-le v6, v7, 0004 // +0x0004
-//@mod 37 76 04 00
- 37 76 05 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 6: |0004: const v6, #float 0.000000 // #0x00000000 int
- 14 06 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 2
- 02 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 314, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 316, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 324, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 327, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_le/d/T_if_le_10;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 65 2F 64 2F 54 5F 69 66 5F 6C 65 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_le_10.java"
- 0F 54 5F 69 66 5F 6C 65 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 404, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 407, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_le/d/T_if_le_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 316 (0x00013c)
- 02 20 00 00 09 00 00 00 3C 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_11.d
deleted file mode 100644
index aaeecc9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_11.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_11.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 8
-
- if-le v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_11.java b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_11.java
deleted file mode 100644
index b92d796..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_11.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_le.d;
-
-public class T_if_le_11 {
-
- public int run(int a, float b) {
- return a <= b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_12.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_12.d
deleted file mode 100644
index 2f9f581..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_12.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_12.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-le v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_12.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_12.dfh
deleted file mode 100644
index a8735cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_12.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_le/d/T_if_le_12.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_le/d/T_if_le_12.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : cae53e73
- 73 3E E5 CA
-// parsed: offset 12, len 20: signature : 28b0...6742
- 28 B0 39 0C B7 33 C6 C9 90 4E 13 C6 72 E1 E3 3E 9A 8A 67 42
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 304 (0x000130) "<init>"
- 30 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 312 (0x000138) "I"
- 38 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 315 (0x00013b) "III"
- 3B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 320 (0x000140) "Ldot/junit/opcodes/if_le/d/T_if_le_12;"
- 40 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 360 (0x000168) "Ljava/lang/Object;"
- 68 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 380 (0x00017c) "T_if_le_12.java"
- 7C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "run"
- 90 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/if_le/d/T_if_le_12;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "III"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 296 (0x000128)
- 02 00 00 00 00 00 00 00 28 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_le/d/T_if_le_12;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_if_le_12.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 405 (0x000195)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 95 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_le.d.T_if_le_12.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_le.d.T_if_le_12.run"
- // parsed: offset 264, len 2: registers_size: 8
- 08 00
- // parsed: offset 266, len 2: ins_size: 3
- 03 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 7
- 07 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: if-le v6, v7, 0005 // +0x0005
-//@mod 37 76 05 00
- 37 76 00 00
- // parsed: offset 284, len 4: |0002: const/16 v6, #int 1234 // #0x4d2
- 13 06 D2 04
- // parsed: offset 288, len 2: |0004: return v6
- 0F 06
- // parsed: offset 290, len 2: |0005: const/4 v6, #int 1 // #0x1
- 12 16
- // parsed: offset 292, len 2: |0006: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 296, len 4: size: 2
- 02 00 00 00
- // parsed: offset 300, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 302, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 304, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 312, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 315, len 5: TYPE_STRING_DATA_ITEM [2] "III"
- 03 49 49 49 00
-// parsed: offset 320, len 40: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/if_le/d/T_if_le_12;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 65 2F 64 2F 54 5F 69 66 5F 6C 65 5F 31 32 3B 00
-// parsed: offset 360, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 380, len 17: TYPE_STRING_DATA_ITEM [5] "T_if_le_12.java"
- 0F 54 5F 69 66 5F 6C 65 5F 31 32 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_le/d/T_if_le_12;"
- // parsed: offset 405, len 1: static_fields_size: 0
- 00
- // parsed: offset 406, len 1: instance_fields_size: 0
- 00
- // parsed: offset 407, len 1: direct_methods_size: 1
- 01
- // parsed: offset 408, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 409, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 410, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 413, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 415, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 416, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 417, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 419, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 296 (0x000128)
- 01 10 00 00 01 00 00 00 28 01 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 304 (0x000130)
- 02 20 00 00 08 00 00 00 30 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 405 (0x000195)
- 00 20 00 00 01 00 00 00 95 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_3.d
deleted file mode 100644
index e389992..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_3.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_le_3.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- if-le v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_4.d
deleted file mode 100644
index 514c26b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_4.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-le v6, v8, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_5.d
deleted file mode 100644
index a70e43f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_5.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- if-le v5, v6, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_6.d
deleted file mode 100644
index fb8bb3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_6.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- if-le v5, v7, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_7.d
deleted file mode 100644
index cf76654..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_7.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;I)I
-.limit regs 8
-
- if-le v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_8.d
deleted file mode 100644
index 34562f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_8.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_le_8.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-le v6, v0, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_9.d
deleted file mode 100644
index 99fa7c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_le_9.java
-.class public dot.junit.opcodes.if_le.d.T_if_le_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-le v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_9.dfh
deleted file mode 100644
index 51da483..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_le/d/T_if_le_9.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_le/d/T_if_le_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_le/d/T_if_le_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 9b4b41ee
- EE 41 4B 9B
-// parsed: offset 12, len 20: signature : eaf2...5695
- EA F2 77 CB B7 40 83 E4 FA CE 5D C9 DE E0 C3 20 0C 85 56 95
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_le/d/T_if_le_9;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_le_9.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "Z"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "ZII"
- 90 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_le/d/T_if_le_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_le/d/T_if_le_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_le_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_le.d.T_if_le_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_le.d.T_if_le_9.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-le v6, v7, 0004 // +0x0004
-//@mod 37 76 04 00
- 37 76 04 01
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 39: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_le/d/T_if_le_9;"
- 25 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 65 2F 64 2F 54 5F 69 66 5F 6C 65 5F 39 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 16: TYPE_STRING_DATA_ITEM [4] "T_if_le_9.java"
- 0E 54 5F 69 66 5F 6C 65 5F 39 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_le/d/T_if_le_9;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/Test_if_lez.java b/tools/vm-tests/src/dot/junit/opcodes/if_lez/Test_if_lez.java
deleted file mode 100644
index 4f72938..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/Test_if_lez.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package dot.junit.opcodes.if_lez;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_lez.d.T_if_lez_1;
-import dot.junit.opcodes.if_lez.d.T_if_lez_2;
-
-public class Test_if_lez extends DxTestCase {
-
- /**
- * @title Argument = 5
- */
- public void testN1() {
- T_if_lez_1 t = new T_if_lez_1();
- assertEquals(1234, t.run(5));
- }
-
- /**
- * @title Argument = -5
- */
- public void testN2() {
- T_if_lez_1 t = new T_if_lez_1();
- assertEquals(1, t.run(-5));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_if_lez_2 t = new T_if_lez_2();
- assertEquals(1, t.run(-1.123f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_lez_1 t = new T_if_lez_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_lez_1 t = new T_if_lez_1();
- assertEquals(1, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0
- */
- public void testB3() {
- T_if_lez_1 t = new T_if_lez_1();
- assertEquals(1, t.run(0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch must not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.d
deleted file mode 100644
index 6429797..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_1.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-lez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.java
deleted file mode 100644
index b3d7441..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_lez.d;
-
-public class T_if_lez_1 {
-
- public int run(int a) {
- return a <= 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.d
deleted file mode 100644
index 82a8268..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_10.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-lez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.dfh
deleted file mode 100644
index 66ce09b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_lez/d/T_if_lez_10.dex'...
-// Opened '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_lez/d/T_if_lez_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : ca1e4159
- 59 41 1E CA
-// parsed: offset 12, len 20: signature : 43ef...3a58
- 43 EF DB CD B8 45 E7 FA DE 03 53 F0 4C 14 8B A8 BE 13 3A 58
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_lez/d/T_if_lez_10;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_lez_10.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 400 (0x000190) "Z"
- 90 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "ZI"
- 93 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_lez/d/T_if_lez_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_lez/d/T_if_lez_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_lez_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_lez.d.T_if_lez_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_lez.d.T_if_lez_10.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-lez v5, 0004 // +0x0004
-//@mod 3D 05 04 00
- 3D 05 00 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_lez/d/T_if_lez_10;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 65 7A 2F 64 2F 54 5F 69 66 5F 6C 65 7A 5F 31 30 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_lez_10.java"
- 10 54 5F 69 66 5F 6C 65 7A 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 400, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 403, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_lez/d/T_if_lez_10;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.d
deleted file mode 100644
index cbe7f34..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_2.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 6
-
- if-lez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.java
deleted file mode 100644
index 37ce198..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_lez.d;
-
-public class T_if_lez_2 {
-
- public int run(float a) {
- return a <= 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_3.d
deleted file mode 100644
index 4efd27a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_3.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-lez v6, Label9
- const/16 v6, 1234
- return v6
-
-Label9:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_4.d
deleted file mode 100644
index 985254d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_4.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 6
-
- if-lez v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_5.d
deleted file mode 100644
index 705c855..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_5.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 6
-
- if-lez v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_6.d
deleted file mode 100644
index 596f1d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_6.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;)I
-.limit regs 6
-
- if-lez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_7.d
deleted file mode 100644
index 129b4bb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_7.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_lez_7.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-lez v0, Label9
- const/16 v0, 1234
- return v0
-
-Label9:
- const/4 v0, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.d
deleted file mode 100644
index b21ab3e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lez_8.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-lez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.dfh
deleted file mode 100644
index d1e27e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_lez/d/T_if_lez_8.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_lez/d/T_if_lez_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 65b03e79
- 79 3E B0 65
-// parsed: offset 12, len 20: signature : 3e9a...b229
- 3E 9A CC 34 9B 91 4F 6B 11 37 FE 19 56 10 75 54 A2 9B B2 29
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_lez/d/T_if_lez_8;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_lez_8.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "V"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "Z"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "ZI"
- 91 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_lez/d/T_if_lez_8;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_lez/d/T_if_lez_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_lez_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_lez.d.T_if_lez_8.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_lez.d.T_if_lez_8.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-lez v5, 0004 // +0x0004
-//@mod 3D 05 04 00
- 3D 05 04 01
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_lez/d/T_if_lez_8;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 65 7A 2F 64 2F 54 5F 69 66 5F 6C 65 7A 5F 38 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_lez_8.java"
- 0F 54 5F 69 66 5F 6C 65 7A 5F 38 2E 6A 61 76 61 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 398, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 401, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_lez/d/T_if_lez_8;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.d
deleted file mode 100644
index 5efdeba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_lez_9.java
-.class public dot.junit.opcodes.if_lez.d.T_if_lez_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-lez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- const v5, 0
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.dfh
deleted file mode 100644
index 4ea81be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_lez/d/T_if_lez_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_lez/d/T_if_lez_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 4845421a
- 1A 42 45 48
-// parsed: offset 12, len 20: signature : 9aec...318f
- 9A EC E7 D4 FF 76 22 57 6F 40 A8 ED 6A 91 9F 1B EF 80 31 8F
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "Ldot/junit/opcodes/if_lez/d/T_if_lez_9;"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 366 (0x00016e) "Ljava/lang/Object;"
- 6E 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 386 (0x000182) "T_if_lez_9.java"
- 82 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 403 (0x000193) "V"
- 93 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 406 (0x000196) "Z"
- 96 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 409 (0x000199) "ZI"
- 99 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 413 (0x00019d) "run"
- 9D 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_lez/d/T_if_lez_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_lez/d/T_if_lez_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_lez_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 418 (0x0001a2)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A2 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_lez.d.T_if_lez_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_lez.d.T_if_lez_9.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-lez v5, 0004 // +0x0004
-//@mod 3D 05 04 00
- 3D 05 05 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 6: |0004: const v5, #float 0.000000 // #0x00000000 int
- 14 05 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v5
- 0F 05
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 1
- 01 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_lez/d/T_if_lez_9;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 65 7A 2F 64 2F 54 5F 69 66 5F 6C 65 7A 5F 39 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 386, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_lez_9.java"
- 0F 54 5F 69 66 5F 6C 65 7A 5F 39 2E 6A 61 76 61 00
-// parsed: offset 403, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 406, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 409, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 413, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_lez/d/T_if_lez_9;"
- // parsed: offset 418, len 1: static_fields_size: 0
- 00
- // parsed: offset 419, len 1: instance_fields_size: 0
- 00
- // parsed: offset 420, len 1: direct_methods_size: 1
- 01
- // parsed: offset 421, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 423, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 426, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 428, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 429, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 430, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 418 (0x0001a2)
- 00 20 00 00 01 00 00 00 A2 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/Test_if_lt.java b/tools/vm-tests/src/dot/junit/opcodes/if_lt/Test_if_lt.java
deleted file mode 100644
index 26a3faa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/Test_if_lt.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package dot.junit.opcodes.if_lt;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_lt.d.T_if_lt_1;
-import dot.junit.opcodes.if_lt.d.T_if_lt_11;
-
-public class Test_if_lt extends DxTestCase {
-
- /**
- * @title Case: 5 < 6
- */
- public void testN1() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1, t.run(5, 6));
- }
-
- /**
- * @title Case: 0x0f0e0d0c = 0x0f0e0d0c
- */
- public void testN2() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1234, t.run(0x0f0e0d0c, 0x0f0e0d0c));
- }
-
- /**
- * @title Case: 5 > -5
- */
- public void testN3() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1234, t.run(5, -5));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of int and float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_if_lt_11 t = new T_if_lt_11();
- assertEquals(1, t.run(1, 1f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB3() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, Integer.MIN_VALUE
- */
- public void testB4() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1234, t.run(0, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_if_lt_1 t = new T_if_lt_1();
- assertEquals(1234, t.run(0, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch target shall not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.d
deleted file mode 100644
index c81d8b3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_icmpge_1.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-lt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.java
deleted file mode 100644
index 5a2e8e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_lt.d;
-
-public class T_if_lt_1 {
-
- public int run(int a, int b) {
- return a < b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.d
deleted file mode 100644
index 4821984..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_lt_10.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-lt v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- const v6, 0
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.dfh
deleted file mode 100644
index bb2ed5a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_lt/d/T_if_lt_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_lt/d/T_if_lt_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c726416b
- 6B 41 26 C7
-// parsed: offset 12, len 20: signature : 7db8...3ca9
- 7D B8 1E 21 EA 87 C8 52 ED CF 14 C9 4B F4 E9 12 D4 32 3C A9
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 316 (0x00013c) "<init>"
- 3C 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 324 (0x000144) "I"
- 44 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 327 (0x000147) "Ldot/junit/opcodes/if_lt/d/T_if_lt_10;"
- 47 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_lt_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 404 (0x000194) "V"
- 94 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 407 (0x000197) "Z"
- 97 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "ZII"
- 9A 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_lt/d/T_if_lt_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_lt/d/T_if_lt_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_lt_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_lt.d.T_if_lt_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_lt.d.T_if_lt_10.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-lt v6, v7, 0004 // +0x0004
-//@mod 34 76 04 00
- 34 76 05 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 6: |0004: const v6, #float 0.000000 // #0x00000000 int
- 14 06 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 2
- 02 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 314, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 316, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 324, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 327, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_lt/d/T_if_lt_10;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 74 2F 64 2F 54 5F 69 66 5F 6C 74 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_lt_10.java"
- 0F 54 5F 69 66 5F 6C 74 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 404, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 407, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_lt/d/T_if_lt_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 316 (0x00013c)
- 02 20 00 00 09 00 00 00 3C 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.d
deleted file mode 100644
index 7e80ecf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_icmpge_11.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 8
-
- if-lt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.java b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.java
deleted file mode 100644
index cc3323f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_lt.d;
-
-public class T_if_lt_11 {
-
- public int run(int a, float b) {
- return a < b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.d
deleted file mode 100644
index f9083cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lt_12.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-lt v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.dfh
deleted file mode 100644
index aed0448..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_lt/d/T_if_lt_12.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_lt/d/T_if_lt_12.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 69884064
- 64 40 88 69
-// parsed: offset 12, len 20: signature : 48bf...a511
- 48 BF EF 03 CC F9 FF EF 11 EC 1C 2E E4 83 0B D9 37 34 A5 11
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_lt/d/T_if_lt_12;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_lt_12.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "V"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 399 (0x00018f) "Z"
- 8F 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 402 (0x000192) "ZII"
- 92 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_lt/d/T_if_lt_12;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_lt/d/T_if_lt_12;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_lt_12.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_lt.d.T_if_lt_12.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_lt.d.T_if_lt_12.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-lt v6, v7, 0004 // +0x0004
-//@mod 34 76 04 00
- 34 76 00 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_lt/d/T_if_lt_12;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 74 2F 64 2F 54 5F 69 66 5F 6C 74 5F 31 32 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_lt_12.java"
- 0F 54 5F 69 66 5F 6C 74 5F 31 32 2E 6A 61 76 61 00
-// parsed: offset 396, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 399, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 402, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_lt/d/T_if_lt_12;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.d
deleted file mode 100644
index 94546c9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_if_icmpge_2.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- if-lt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.java
deleted file mode 100644
index 14e148c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.if_lt.d;
-
-public class T_if_lt_2 {
-
- public int run(float a, float b) {
- return a < b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_4.d
deleted file mode 100644
index 9a93ac6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_icmpge_4.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-lt v6, v8, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_5.d
deleted file mode 100644
index 7d77ad9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_icmpge_5.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- if-lt v5, v6, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_6.d
deleted file mode 100644
index 9d1910e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_icmpge_6.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- if-lt v5, v7, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_7.d
deleted file mode 100644
index 8d126c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_icmpge_7.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;I)I
-.limit regs 8
-
- if-lt v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.d
deleted file mode 100644
index 8c2f2ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_lt_9.java
-.class public dot.junit.opcodes.if_lt.d.T_if_lt_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-lt v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.dfh
deleted file mode 100644
index 10b38ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_lt/d/T_if_lt_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_lt/d/T_if_lt_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : b45f4033
- 33 40 5F B4
-// parsed: offset 12, len 20: signature : 4cb8...7b33
- 4C B8 1D 60 D7 F6 8E D3 C9 42 C8 6B 13 3F AD C6 EB 57 7B 33
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_lt/d/T_if_lt_9;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_lt_9.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "Z"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 400 (0x000190) "ZII"
- 90 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_lt/d/T_if_lt_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_lt/d/T_if_lt_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_lt_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_lt.d.T_if_lt_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_lt.d.T_if_lt_9.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-lt v6, v7, 0004 // +0x0004
-//@mod 34 76 04 00
- 34 76 04 01
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 39: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_lt/d/T_if_lt_9;"
- 25 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 74 2F 64 2F 54 5F 69 66 5F 6C 74 5F 39 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 16: TYPE_STRING_DATA_ITEM [4] "T_if_lt_9.java"
- 0E 54 5F 69 66 5F 6C 74 5F 39 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 400, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_lt/d/T_if_lt_9;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java
deleted file mode 100644
index b70d16e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package dot.junit.opcodes.if_ltz;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_ltz.d.T_if_ltz_1;
-import dot.junit.opcodes.if_ltz.d.T_if_ltz_2;
-
-public class Test_if_ltz extends DxTestCase {
-
- /**
- * @title Argument = 5
- */
- public void testN1() {
- T_if_ltz_1 t = new T_if_ltz_1();
- assertEquals(1234, t.run(5));
- }
-
- /**
- * @title Argument = -5
- */
- public void testN2() {
- T_if_ltz_1 t = new T_if_ltz_1();
- assertEquals(1, t.run(-5));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_if_ltz_2 t = new T_if_ltz_2();
- assertEquals(1234, t.run(1.123f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_ltz_1 t = new T_if_ltz_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_ltz_1 t = new T_if_ltz_1();
- assertEquals(1, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0
- */
- public void testB3() {
- T_if_ltz_1 t = new T_if_ltz_1();
- assertEquals(1234, t.run(0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch must not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.d
deleted file mode 100644
index 7022a90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_1.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-ltz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.java
deleted file mode 100644
index 7e666cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ltz.d;
-
-public class T_if_ltz_1 {
-
- public int run(int a) {
- return a < 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.d
deleted file mode 100644
index aa01356..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_2.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 6
-
- if-ltz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.java
deleted file mode 100644
index 0c0480e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ltz.d;
-
-public class T_if_ltz_2 {
-
- public int run(float a) {
- return a < 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_3.d
deleted file mode 100644
index d2405ed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_3.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-ltz v6, Label9
- const/16 v6, 1234
- return v6
-
-Label9:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_4.d
deleted file mode 100644
index 804ef88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_4.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 6
-
- if-ltz v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_5.d
deleted file mode 100644
index af8e741..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_5.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 6
-
- if-ltz v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_6.d
deleted file mode 100644
index c56730f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_6.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;)I
-.limit regs 6
-
- if-ltz v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.d
deleted file mode 100644
index f14a551..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_7.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-ltz v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.dfh
deleted file mode 100644
index afb4652..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.dex'...
-// Opened '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 7337400f
- 0F 40 37 73
-// parsed: offset 12, len 20: signature : 0250...bf7f
- 02 50 04 7A E3 17 74 3C 13 73 F6 D7 EA 11 9E F4 EC 4E BF 7F
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_7;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_ltz_7.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "V"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "Z"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "ZI"
- 91 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_7;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_7;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ltz_7.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ltz.d.T_if_ltz_7.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ltz.d.T_if_ltz_7.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ltz v5, 0004 // +0x0004
-//@mod 3A 05 04 00
- 3A 05 00 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_7;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 74 7A 2F 64 2F 54 5F 69 66 5F 6C 74 7A 5F 37 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ltz_7.java"
- 0F 54 5F 69 66 5F 6C 74 7A 5F 37 2E 6A 61 76 61 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 398, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 401, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_7;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.d
deleted file mode 100644
index 650e299..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ltz_8.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-ltz v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.dfh
deleted file mode 100644
index dc3b594..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 6a9b3f87
- 87 3F 9B 6A
-// parsed: offset 12, len 20: signature : 2cbc...44c1
- 2C BC B6 C9 37 D4 49 42 95 BD 36 89 BC B0 07 51 07 6A 44 C1
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_8;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_ltz_8.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "V"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "Z"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "ZI"
- 91 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_8;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ltz_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ltz.d.T_if_ltz_8.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ltz.d.T_if_ltz_8.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ltz v5, 0004 // +0x0004
-//@mod 3A 05 04 00
- 3A 05 04 01
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_8;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 74 7A 2F 64 2F 54 5F 69 66 5F 6C 74 7A 5F 38 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ltz_8.java"
- 0F 54 5F 69 66 5F 6C 74 7A 5F 38 2E 6A 61 76 61 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 398, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 401, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_8;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.d
deleted file mode 100644
index 3b4a3dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_ltz_9.java
-.class public dot.junit.opcodes.if_ltz.d.T_if_ltz_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-ltz v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- const v5, 0
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.dfh
deleted file mode 100644
index dc5146c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 9e5c41e6
- E6 41 5C 9E
-// parsed: offset 12, len 20: signature : c9e3...0f3f
- C9 E3 71 AB 73 15 F5 E7 72 4D 3A A7 77 F4 E9 3F FF 4D 0F 3F
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_9;"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 366 (0x00016e) "Ljava/lang/Object;"
- 6E 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 386 (0x000182) "T_if_ltz_9.java"
- 82 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 403 (0x000193) "V"
- 93 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 406 (0x000196) "Z"
- 96 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 409 (0x000199) "ZI"
- 99 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 413 (0x00019d) "run"
- 9D 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ltz_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 418 (0x0001a2)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A2 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ltz.d.T_if_ltz_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ltz.d.T_if_ltz_9.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ltz v5, 0004 // +0x0004
-//@mod 3A 05 04 00
- 3A 05 05 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 6: |0004: const v5, #float 0.000000 // #0x00000000 int
- 14 05 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v5
- 0F 05
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 1
- 01 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_9;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6C 74 7A 2F 64 2F 54 5F 69 66 5F 6C 74 7A 5F 39 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 386, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ltz_9.java"
- 0F 54 5F 69 66 5F 6C 74 7A 5F 39 2E 6A 61 76 61 00
-// parsed: offset 403, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 406, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 409, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 413, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ltz/d/T_if_ltz_9;"
- // parsed: offset 418, len 1: static_fields_size: 0
- 00
- // parsed: offset 419, len 1: instance_fields_size: 0
- 00
- // parsed: offset 420, len 1: direct_methods_size: 1
- 01
- // parsed: offset 421, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 423, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 426, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 428, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 429, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 430, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 418 (0x0001a2)
- 00 20 00 00 01 00 00 00 A2 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/Test_if_ne.java b/tools/vm-tests/src/dot/junit/opcodes/if_ne/Test_if_ne.java
deleted file mode 100644
index 610fe96..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/Test_if_ne.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package dot.junit.opcodes.if_ne;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_ne.d.T_if_ne_1;
-import dot.junit.opcodes.if_ne.d.T_if_ne_2;
-import dot.junit.opcodes.if_ne.d.T_if_ne_4;
-
-public class Test_if_ne extends DxTestCase {
-
- /**
- * @title Arguments = 5, 6
- */
- public void testN1() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1, t.run(5, 6));
- }
-
- /**
- * @title Arguments = 0x0f0e0d0c, 0x0f0e0d0c
- */
- public void testN2() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1234, t.run(0x0f0e0d0c, 0x0f0e0d0c));
- }
-
- /**
- * @title Arguments = 5, -5
- */
- public void testN3() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1, t.run(5, -5));
- }
-
- /**
- * @title Arguments = 0x01001234, 0x1234
- */
- public void testN4() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1, t.run(0x01001234, 0x1234));
- }
-
- /**
- * @title compare references
- */
- public void testN5() {
- T_if_ne_2 t = new T_if_ne_2();
- String a = "a";
- String b = "b";
- assertEquals(1, t.run(a, b));
- }
-
- /**
- * @title compare references
- */
- public void testN6() {
- T_if_ne_2 t = new T_if_ne_2();
- String a = "a";
- assertEquals(1234, t.run(a, a));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of int and float makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_if_ne_4 t = new T_if_ne_4();
- assertEquals(1, t.run(1f, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1234, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 1234567
- */
- public void testB3() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1, t.run(0, 1234567));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB4() {
- T_if_ne_1 t = new T_if_ne_1();
- assertEquals(1234, t.run(0, 0));
- }
-
- /**
- * @title Compare with null
- */
- public void testB5() {
- T_if_ne_2 t = new T_if_ne_2();
- String a = "a";
- assertEquals(1, t.run(null, a));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch target shall not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.d
deleted file mode 100644
index cb84784..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_1.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-ne v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.java
deleted file mode 100644
index ebc05ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ne.d;
-
-public class T_if_ne_1 {
-
- public int run(int a, int b) {
- return a != b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.d
deleted file mode 100644
index f42d830..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_10.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-ne v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.dfh
deleted file mode 100644
index f5f9427..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_ne/d/T_if_ne_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_ne/d/T_if_ne_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 095c418d
- 8D 41 5C 09
-// parsed: offset 12, len 20: signature : c237...7d40
- C2 37 DB 94 22 A2 D1 8C 42 64 8C F7 AF 4F F0 C2 C2 D3 7D 40
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_ne/d/T_if_ne_10;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_ne_10.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "V"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 399 (0x00018f) "Z"
- 8F 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 402 (0x000192) "ZII"
- 92 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ne/d/T_if_ne_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ne/d/T_if_ne_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ne_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ne.d.T_if_ne_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ne.d.T_if_ne_10.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ne v6, v7, 0004 // +0x0004
-//@mod 33 76 04 00
- 33 76 04 01
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ne/d/T_if_ne_10;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6E 65 2F 64 2F 54 5F 69 66 5F 6E 65 5F 31 30 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ne_10.java"
- 0F 54 5F 69 66 5F 6E 65 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 396, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 399, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 402, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ne/d/T_if_ne_10;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.d
deleted file mode 100644
index 65bb0d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_ne_11.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-ne v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- const v6, 0
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.dfh
deleted file mode 100644
index 8b5c5e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.dfh
+++ /dev/null
@@ -1,280 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_ne/d/T_if_ne_11.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_ne/d/T_if_ne_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c3f03ff3
- F3 3F F0 C3
-// parsed: offset 12, len 20: signature : 1786...89ee
- 17 86 0D 00 7F F4 86 BF 36 21 B8 93 62 57 3D EA B7 59 89 EE
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 316 (0x00013c) "<init>"
- 3C 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 324 (0x000144) "I"
- 44 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 327 (0x000147) "Ldot/junit/opcodes/if_ne/d/T_if_ne_11;"
- 47 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_ne_11.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 404 (0x000194) "V"
- 94 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 407 (0x000197) "Z"
- 97 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "ZII"
- 9A 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ne/d/T_if_ne_11;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ne/d/T_if_ne_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ne_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ne.d.T_if_ne_11.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ne.d.T_if_ne_11.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ne v6, v7, 0004 // +0x0004
-//@mod 33 76 04 00
- 33 76 05 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 6: |0004: const v6, #float 0.000000 // #0x00000000 int
- 14 06 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v6
- 0F 06
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 2
- 02 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 314, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 316, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 324, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 327, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ne/d/T_if_ne_11;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6E 65 2F 64 2F 54 5F 69 66 5F 6E 65 5F 31 31 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ne_11.java"
- 0F 54 5F 69 66 5F 6E 65 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 404, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 407, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ne/d/T_if_ne_11;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 316 (0x00013c)
- 02 20 00 00 09 00 00 00 3C 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.d
deleted file mode 100644
index 0893fa4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_12.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)Z
-.limit regs 8
-
- if-ne v6, v7, Label10
- const/4 v6, 0
- return v6
-
-Label10:
- nop
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.dfh
deleted file mode 100644
index e78249f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_ne/d/T_if_ne_12.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/if_ne/d/T_if_ne_12.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 37603d62
- 62 3D 60 37
-// parsed: offset 12, len 20: signature : 24e7...4311
- 24 E7 8D 35 83 34 1E 83 9C DE 27 13 02 76 B3 A3 53 37 43 11
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/if_ne/d/T_if_ne_12;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_ne_12.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "V"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 399 (0x00018f) "Z"
- 8F 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 402 (0x000192) "ZII"
- 92 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_ne/d/T_if_ne_12;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZII"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_ne/d/T_if_ne_12;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_ne_12.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_ne.d.T_if_ne_12.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_ne.d.T_if_ne_12.run"
- // parsed: offset 272, len 2: registers_size: 8
- 08 00
- // parsed: offset 274, len 2: ins_size: 3
- 03 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-ne v6, v7, 0004 // +0x0004
-//@mod 33 76 04 00
- 33 76 00 00
- // parsed: offset 292, len 2: |0002: const/4 v6, #int 0 // #0x0
- 12 06
- // parsed: offset 294, len 2: |0003: return v6
- 0F 06
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v6
- 0F 06
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 2
- 02 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
- // parsed: offset 306, len 2: type_item [1] type_idx: 0
- 00 00
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 40: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_ne/d/T_if_ne_12;"
- 26 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6E 65 2F 64 2F 54 5F 69 66 5F 6E 65 5F 31 32 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_ne_12.java"
- 0F 54 5F 69 66 5F 6E 65 5F 31 32 2E 6A 61 76 61 00
-// parsed: offset 396, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 399, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 402, len 5: TYPE_STRING_DATA_ITEM [7] "ZII"
- 03 5A 49 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_ne/d/T_if_ne_12;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 308 (0x000134)
- 02 20 00 00 09 00 00 00 34 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.d
deleted file mode 100644
index 039f954..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_2.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)I
-.limit regs 8
-
- if-ne v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.java
deleted file mode 100644
index 79c7519..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ne.d;
-
-public class T_if_ne_2 {
-
- public int run(String a, String b) {
- return a != b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.d
deleted file mode 100644
index aaa66e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_4.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- if-ne v6, v7, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.java b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.java
deleted file mode 100644
index fbd1049..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_ne.d;
-
-public class T_if_ne_4 {
-
- public int run(float a, int b) {
- return a != b ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_5.d
deleted file mode 100644
index 4bfefaa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_5.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-ne v6, v8, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_7.d
deleted file mode 100644
index 5e57f66..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_7.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- if-ne v5, v6, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_8.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_8.d
deleted file mode 100644
index 0001b04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_8.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_8.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- if-ne v5, v7, Label11
- const/16 v5, 1234
- return v5
-
-Label11:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_9.d
deleted file mode 100644
index 4f3f107..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_ne/d/T_if_ne_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_ne_9.java
-.class public dot.junit.opcodes.if_ne.d.T_if_ne_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- if-ne v6, v5, Label11
- const/16 v6, 1234
- return v6
-
-Label11:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/Test_if_nez.java b/tools/vm-tests/src/dot/junit/opcodes/if_nez/Test_if_nez.java
deleted file mode 100644
index 1283f37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/Test_if_nez.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package dot.junit.opcodes.if_nez;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.if_nez.d.T_if_nez_1;
-import dot.junit.opcodes.if_nez.d.T_if_nez_2;
-import dot.junit.opcodes.if_nez.d.T_if_nez_3;
-import dot.junit.opcodes.if_nez.d.T_if_nez_4;
-
-public class Test_if_nez extends DxTestCase {
-
- /**
- * @title Argument = 5 and -5
- */
- public void testN1() {
- T_if_nez_1 t = new T_if_nez_1();
- assertEquals(1, t.run(5));
- assertEquals(1, t.run(-5));
- }
-
- /**
- * @title Arguments = null
- */
- public void testN2() {
- T_if_nez_2 t = new T_if_nez_2();
- String str = null;
- assertEquals(1234, t.run(str));
- }
-
- /**
- * @title Arguments = not null
- */
- public void testN3() {
- T_if_nez_2 t = new T_if_nez_2();
- String str = "abc";
- assertEquals(1, t.run(str));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_if_nez_3 t = new T_if_nez_3();
- assertEquals(1, t.run(3.123f));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE
- */
- public void testB1() {
- T_if_nez_1 t = new T_if_nez_1();
- assertEquals(1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE
- */
- public void testB2() {
- T_if_nez_1 t = new T_if_nez_1();
- assertEquals(1, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0
- */
- public void testB3() {
- T_if_nez_1 t = new T_if_nez_1();
- assertEquals(1234, t.run(0));
- }
-
- /**
- * @title Compare reference with null
- */
- public void testB4() {
- T_if_nez_4 t = new T_if_nez_4();
- assertEquals(1234, t.run(null));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title branch must not be 0
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.d
deleted file mode 100644
index da15ff2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_1.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-nez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.java b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.java
deleted file mode 100644
index 7e8aab3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_nez.d;
-
-public class T_if_nez_1 {
-
- public int run(int a) {
- return a != 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.d
deleted file mode 100644
index 4a5a9a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.source T_if_nez_10.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-nez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- const v5, 0
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.dfh
deleted file mode 100644
index c690b98..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.dfh
+++ /dev/null
@@ -1,278 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_nez/d/T_if_nez_10.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_nez/d/T_if_nez_10.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : f7d6442e
- 2E 44 D6 F7
-// parsed: offset 12, len 20: signature : b285...f2c1
- B2 85 AD 8B CF 5D F1 BB 04 91 E9 46 C9 64 A2 AE E4 DA F2 C1
-// parsed: offset 32, len 4: file_size : 572
- 3C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 436 (0x0001b4)
- B4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 314 (0x00013a) "<init>"
- 3A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 322 (0x000142) "I"
- 42 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 325 (0x000145) "Ldot/junit/opcodes/if_nez/d/T_if_nez_10;"
- 45 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 367 (0x00016f) "Ljava/lang/Object;"
- 6F 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 387 (0x000183) "T_if_nez_10.java"
- 83 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 405 (0x000195) "V"
- 95 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 408 (0x000198) "Z"
- 98 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 411 (0x00019b) "ZI"
- 9B 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 415 (0x00019f) "run"
- 9F 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_nez/d/T_if_nez_10;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 308 (0x000134)
- 07 00 00 00 04 00 00 00 34 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_nez/d/T_if_nez_10;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_nez_10.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 420 (0x0001a4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 A4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_nez.d.T_if_nez_10.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_nez.d.T_if_nez_10.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 9
- 09 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-nez v5, 0004 // +0x0004
-//@mod 39 05 04 00
- 39 05 05 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 6: |0004: const v5, #float 0.000000 // #0x00000000 int
- 14 05 00 00 00 00
- // parsed: offset 302, len 2: |0007: nop // spacer
- 00 00
- // parsed: offset 304, len 2: |0008: return v5
- 0F 05
- // tries:
- // handlers:
-// parsed: offset 306, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 308, len 4: size: 1
- 01 00 00 00
- // parsed: offset 312, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 314, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 322, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 325, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_nez/d/T_if_nez_10;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6E 65 7A 2F 64 2F 54 5F 69 66 5F 6E 65 7A 5F 31 30 3B 00
-// parsed: offset 367, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 387, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_nez_10.java"
- 10 54 5F 69 66 5F 6E 65 7A 5F 31 30 2E 6A 61 76 61 00
-// parsed: offset 405, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 408, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 411, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 415, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_nez/d/T_if_nez_10;"
- // parsed: offset 420, len 1: static_fields_size: 0
- 00
- // parsed: offset 421, len 1: instance_fields_size: 0
- 00
- // parsed: offset 422, len 1: direct_methods_size: 1
- 01
- // parsed: offset 423, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 424, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 425, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 428, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 430, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 431, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 432, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 434, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 436, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 440, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 452, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 464, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 476, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 488, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 308 (0x000134)
- 01 10 00 00 01 00 00 00 34 01 00 00
- // parsed: offset 536, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 314 (0x00013a)
- 02 20 00 00 09 00 00 00 3A 01 00 00
- // parsed: offset 548, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 20 00 00 01 00 00 00 A4 01 00 00
- // parsed: offset 560, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 436 (0x0001b4)
- 00 10 00 00 01 00 00 00 B4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.d
deleted file mode 100644
index 81ef2ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_nez_11.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-nez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.dfh
deleted file mode 100644
index 07373f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_nez/d/T_if_nez_11.dex'...
-// Opened '/home/julia/workspace/dalvikNew/out/classes_dasm/dot/junit/opcodes/if_nez/d/T_if_nez_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a76043b4
- B4 43 60 A7
-// parsed: offset 12, len 20: signature : 1a2c...f8f3
- 1A 2C DB A0 C2 B5 CC A7 79 C0 8C CA A6 EE F6 C4 35 81 F8 F3
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_nez/d/T_if_nez_11;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 359 (0x000167) "Ljava/lang/Object;"
- 67 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 379 (0x00017b) "T_if_nez_11.java"
- 7B 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 400 (0x000190) "Z"
- 90 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "ZI"
- 93 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 407 (0x000197) "run"
- 97 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_nez/d/T_if_nez_11;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_nez/d/T_if_nez_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_nez_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 412 (0x00019c)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9C 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_nez.d.T_if_nez_11.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_nez.d.T_if_nez_11.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-nez v5, 0004 // +0x0004
-//@mod 39 05 04 00
- 39 05 00 00
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 42: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_nez/d/T_if_nez_11;"
- 28 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6E 65 7A 2F 64 2F 54 5F 69 66 5F 6E 65 7A 5F 31 31 3B 00
-// parsed: offset 359, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 379, len 18: TYPE_STRING_DATA_ITEM [4] "T_if_nez_11.java"
- 10 54 5F 69 66 5F 6E 65 7A 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 400, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 403, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 407, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_nez/d/T_if_nez_11;"
- // parsed: offset 412, len 1: static_fields_size: 0
- 00
- // parsed: offset 413, len 1: instance_fields_size: 0
- 00
- // parsed: offset 414, len 1: direct_methods_size: 1
- 01
- // parsed: offset 415, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 20 00 00 01 00 00 00 9C 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.d
deleted file mode 100644
index d95004a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_2.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/String;)I
-.limit regs 6
-
- if-nez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.java b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.java
deleted file mode 100644
index 802b021..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_nez.d;
-
-public class T_if_nez_2 {
-
- public int run(String o) {
- return o != null ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.d
deleted file mode 100644
index ea90b8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_3.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 6
-
- if-nez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.java b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.java
deleted file mode 100644
index 149b181..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_nez.d;
-
-public class T_if_nez_3 {
-
- public int run(float a) {
- return a != 0 ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.d
deleted file mode 100644
index efe46b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_4.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)I
-.limit regs 6
-
- if-nez v5, Label9
- const/16 v5, 1234
- return v5
-
-Label9:
- const/4 v5, 1
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.java b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.java
deleted file mode 100644
index 96b98a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.if_nez.d;
-
-public class T_if_nez_4 {
-
- public int run(Object o) {
- return o != null ? 1 : 1234;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_5.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_5.d
deleted file mode 100644
index 8640ec1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_5.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_5.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 6
-
- if-nez v6, Label9
- const/16 v6, 1234
- return v6
-
-Label9:
- const/4 v6, 1
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_6.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_6.d
deleted file mode 100644
index 67348ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_6.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_6.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 6
-
- if-nez v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_7.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_7.d
deleted file mode 100644
index b22102e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_7.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_ifne_7.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 6
-
- if-nez v4, Label9
- const/16 v4, 1234
- return v4
-
-Label9:
- const/4 v4, 1
- return v4
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.d b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.d
deleted file mode 100644
index 5ea760a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.d
+++ /dev/null
@@ -1,23 +0,0 @@
-.source T_if_nez_9.java
-.class public dot.junit.opcodes.if_nez.d.T_if_nez_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 6
-
- if-nez v5, Label8
- const/4 v5, 0
- return v5
-
-Label8:
- nop
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.dfh
deleted file mode 100644
index acd19bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/if_nez/d/T_if_nez_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/if_nez/d/T_if_nez_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 533b414c
- 4C 41 3B 53
-// parsed: offset 12, len 20: signature : a2dd...7edb
- A2 DD 9C 8A FB 23 5C 93 89 55 98 BF E0 6A 76 51 CB 17 7E DB
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 306 (0x000132) "<init>"
- 32 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 314 (0x00013a) "I"
- 3A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/if_nez/d/T_if_nez_9;"
- 3D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 358 (0x000166) "Ljava/lang/Object;"
- 66 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 378 (0x00017a) "T_if_nez_9.java"
- 7A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "V"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "Z"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "ZI"
- 91 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 405 (0x000195) "run"
- 95 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/if_nez/d/T_if_nez_9;"
- 02 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 6 (0x000006) "Z"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 7 (0x000007) "ZI"
-// return_type_idx: 4 (0x000004) "Z"
-// parameters_off: 300 (0x00012c)
- 07 00 00 00 04 00 00 00 2C 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/if_nez/d/T_if_nez_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_if_nez_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.if_nez.d.T_if_nez_9.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.if_nez.d.T_if_nez_9.run"
- // parsed: offset 272, len 2: registers_size: 6
- 06 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: if-nez v5, 0004 // +0x0004
-//@mod 39 05 04 00
- 39 05 04 01
- // parsed: offset 292, len 2: |0002: const/4 v5, #int 0 // #0x0
- 12 05
- // parsed: offset 294, len 2: |0003: return v5
- 0F 05
- // parsed: offset 296, len 2: |0004: nop // spacer
- 00 00
- // parsed: offset 298, len 2: |0005: return v5
- 0F 05
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 300, len 4: size: 1
- 01 00 00 00
- // parsed: offset 304, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 306, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 314, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 317, len 41: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/if_nez/d/T_if_nez_9;"
- 27 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 66 5F 6E 65 7A 2F 64 2F 54 5F 69 66 5F 6E 65 7A 5F 39 3B 00
-// parsed: offset 358, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 378, len 17: TYPE_STRING_DATA_ITEM [4] "T_if_nez_9.java"
- 0F 54 5F 69 66 5F 6E 65 7A 5F 39 2E 6A 61 76 61 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 398, len 3: TYPE_STRING_DATA_ITEM [6] "Z"
- 01 5A 00
-// parsed: offset 401, len 4: TYPE_STRING_DATA_ITEM [7] "ZI"
- 02 5A 49 00
-// parsed: offset 405, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/if_nez/d/T_if_nez_9;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 272 (0x000110)
- 90 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 300 (0x00012c)
- 01 10 00 00 01 00 00 00 2C 01 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 306 (0x000132)
- 02 20 00 00 09 00 00 00 32 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget/TestStubs.java
deleted file mode 100644
index 07bb886..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget;
-
-public class TestStubs {
- // used by testVFE4
- private int TestStubField = 50;
- // ussed by testVFE15
- protected int TestStubProtectedField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/Test_iget.java b/tools/vm-tests/src/dot/junit/opcodes/iget/Test_iget.java
deleted file mode 100644
index 50658ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/Test_iget.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget.d.T_iget_1;
-import dot.junit.opcodes.iget.d.T_iget_11;
-import dot.junit.opcodes.iget.d.T_iget_12;
-import dot.junit.opcodes.iget.d.T_iget_13;
-import dot.junit.opcodes.iget.d.T_iget_2;
-import dot.junit.opcodes.iget.d.T_iget_21;
-import dot.junit.opcodes.iget.d.T_iget_5;
-import dot.junit.opcodes.iget.d.T_iget_6;
-import dot.junit.opcodes.iget.d.T_iget_7;
-import dot.junit.opcodes.iget.d.T_iget_8;
-import dot.junit.opcodes.iget.d.T_iget_9;
-
-public class Test_iget extends DxTestCase {
-
- /**
- * @title type - int
- */
- public void testN1() {
- T_iget_1 t = new T_iget_1();
- assertEquals(5, t.run());
- }
-
- /**
- * @title type - float
- */
- public void testN2() {
- T_iget_2 t = new T_iget_2();
- assertEquals(123f, t.run());
- }
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget.d.T_iget_1
- //@uses dot.junit.opcodes.iget.d.T_iget_11
- T_iget_11 t = new T_iget_11();
- assertEquals(10, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_9 t = new T_iget_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B13
- * @title read integer from long field - only field with same name but
- * different type exist
- */
- public void testVFE3() {
- try {
- new T_iget_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible private field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget.d.T_iget_6
- //@uses dot.junit.opcodes.iget.TestStubs
- try {
- new T_iget_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget.d.T_iget_12
- //@uses dot.junit.opcodes.iget.d.T_iget_1
- try {
- new T_iget_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget shall not work for boolean fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget shall not work for byte fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read protected field of unrelated class.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.iget.d.T_iget_21
- //@uses dot.junit.opcodes.iget.TestStubs
- try {
- new T_iget_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget.d.T_iget_5
- //@uses dot.junit.opcodes.iget.TestStubs
- try {
- new T_iget_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_1.d
deleted file mode 100644
index cac6528..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_1.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_1.java
-.class public dot.junit.opcodes.iget.d.T_iget_1
-.super java/lang/Object
-
-.field public i1 I
-.field protected p1 I
-.field private pvt1 I
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const/4 v0, 5
- iput v0, v1, dot.junit.opcodes.iget.d.T_iget_1.i1 I
-
- const/16 v0, 10
- iput v0, v1, dot.junit.opcodes.iget.d.T_iget_1.p1 I
-
- const/16 v0, 20
- iput v0, v1, dot.junit.opcodes.iget.d.T_iget_1.pvt1 I
-
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_1.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_1.java
deleted file mode 100644
index 1ce655a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_1 {
- public int i1 = 5;
- protected int p1 = 10;
- private int pvt1 = 20;
-
- public int run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_11.d
deleted file mode 100644
index 6e64e3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_11.java
-.class public dot.junit.opcodes.iget.d.T_iget_11
-.super dot/junit/opcodes/iget/d/T_iget_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget/d/T_iget_1/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_1.p1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_11.java
deleted file mode 100644
index 9d6b376..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_11 extends T_iget_1 {
-
- public int run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_12.d
deleted file mode 100644
index 312dd9c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_12.java
-.class public dot.junit.opcodes.iget.d.T_iget_12
-.super dot/junit/opcodes/iget/d/T_iget_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget/d/T_iget_1/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_1.pvt1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_12.java
deleted file mode 100644
index b9f40ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_12 extends T_iget_1 {
-
- @Override
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_13.d
deleted file mode 100644
index eed73b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_13.java
-.class public dot.junit.opcodes.iget.d.T_iget_13
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_13.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_13.java
deleted file mode 100644
index 1038f56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_14.d
deleted file mode 100644
index faa6271..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_14.java
-.class public dot.junit.opcodes.iget.d.T_iget_14
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_15.d
deleted file mode 100644
index d50305b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_15.java
-.class public dot.junit.opcodes.iget.d.T_iget_15
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_16.d
deleted file mode 100644
index 8a5253b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_16.java
-.class public dot.junit.opcodes.iget.d.T_iget_16
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_16.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_17.d
deleted file mode 100644
index 69d1af4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_17.java
-.class public dot.junit.opcodes.iget.d.T_iget_17
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_18.d
deleted file mode 100644
index c081e55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_18.java
-.class public dot.junit.opcodes.iget.d.T_iget_18
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_18.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_19.d
deleted file mode 100644
index a555e94..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_19.java
-.class public dot.junit.opcodes.iget.d.T_iget_19
-.super java/lang/Object
-
-.field public i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_2.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_2.d
deleted file mode 100644
index bf07640..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_2.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_2.java
-.class public dot.junit.opcodes.iget.d.T_iget_2
-.super java/lang/Object
-
-.field public val F
-
-.method <clinit>()V
-.limit regs 2
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const v0, 123.0
- iput v0, v1, dot.junit.opcodes.iget.d.T_iget_2.val F
-
- return-void
-.end method
-
-.method public run()F
-.limit regs 4
-
- iget v1, v3, dot.junit.opcodes.iget.d.T_iget_2.val F
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_2.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_2.java
deleted file mode 100644
index 3efa19d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_2 {
-
- public float val = 123.0f;
-
- public float run() {
- return val;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_20.d
deleted file mode 100644
index b34faae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_20.java
-.class public dot.junit.opcodes.iget.d.T_iget_20
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v0, v2, dot.junit.opcodes.iget.d.T_iget_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_21.d
deleted file mode 100644
index 569458b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_21.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_21.java
-.class public dot.junit.opcodes.iget.d.T_iget_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget/TestStubs/<init>()V
-
- iget v1, v0, dot.junit.opcodes.iget.TestStubs.TestStubProtectedField I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_21.java
deleted file mode 100644
index 31db5f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_21 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_3.d
deleted file mode 100644
index f362d0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_3.java
-.class public dot.junit.opcodes.iget.d.T_iget_3
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget v3, v2, dot.junit.opcodes.iget.d.T_iget_3.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_30.d
deleted file mode 100644
index 3564c81..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_30.java
-.class public dot.junit.opcodes.iget.d.T_iget_30
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget/d/T_iget_30
- iget v1, v0, dot.junit.opcodes.iget.d.T_iget_30.st_i1 I
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_4.d
deleted file mode 100644
index 8336a2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_4.java
-.class public dot.junit.opcodes.iget.d.T_iget_4
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_4.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_4.dfh
deleted file mode 100644
index c29f935..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget/d/T_iget_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget/d/T_iget_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 385d3b6c
- 6C 3B 5D 38
-// parsed: offset 12, len 20: signature : bbc1...00f4
- BB C1 79 16 63 A5 BB 13 9D 24 11 CB 85 1F A6 17 C0 39 00 F4
-// parsed: offset 32, len 4: file_size : 544
- 20 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 408 (0x000198)
- 98 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 296
- 28 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "I"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/iget/d/T_iget_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 344 (0x000158) "Ljava/lang/Object;"
- 58 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 364 (0x00016c) "T_iget_4.java"
- 6C 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 379 (0x00017b) "V"
- 7B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 382 (0x00017e) "i1"
- 7E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 386 (0x000182) "run"
- 82 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iget/d/T_iget_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iget/d/T_iget_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iget_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 391 (0x000187)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 87 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget.d.T_iget_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget.d.T_iget_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_4;.i1:I // field@0000
-//@mod 52 21 00 00
- 52 21 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 307, len 37: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iget/d/T_iget_4;"
- 23 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 2F 64 2F 54 5F 69 67 65 74 5F 34 3B 00
-// parsed: offset 344, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 364, len 15: TYPE_STRING_DATA_ITEM [4] "T_iget_4.java"
- 0D 54 5F 69 67 65 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 379, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 382, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 386, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget/d/T_iget_4;"
- // parsed: offset 391, len 1: static_fields_size: 0
- 00
- // parsed: offset 392, len 1: instance_fields_size: 1
- 01
- // parsed: offset 393, len 1: direct_methods_size: 1
- 01
- // parsed: offset 394, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 395, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 396, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 397, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 398, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 401, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 403, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 404, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 405, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 407, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 408, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 412, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 424, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 436, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 448, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 460, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 472, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 484, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 496, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 508, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 520, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 391 (0x000187)
- 00 20 00 00 01 00 00 00 87 01 00 00
- // parsed: offset 532, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 408 (0x000198)
- 00 10 00 00 01 00 00 00 98 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_5.d
deleted file mode 100644
index 7a7c3ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_5.java
-.class public dot.junit.opcodes.iget.d.T_iget_5
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_5.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_5.java
deleted file mode 100644
index 053f013..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_5 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_6.d
deleted file mode 100644
index 8ea70c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_6.java
-.class public dot.junit.opcodes.iget.d.T_iget_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget/TestStubs/<init>()V
-
- iget v1, v0, dot.junit.opcodes.iget.TestStubs.TestStubField I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_6.java
deleted file mode 100644
index efb61d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_6 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_7.d
deleted file mode 100644
index a68b0f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_7.java
-.class public dot.junit.opcodes.iget.d.T_iget_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_7no_class.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_7.java
deleted file mode 100644
index 54b848f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_7 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_8.d
deleted file mode 100644
index 9fc3b75..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_8.java
-.class public dot.junit.opcodes.iget.d.T_iget_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- iget v1, v2, dot.junit.opcodes.iget.d.T_iget_8.i1N I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_8.java
deleted file mode 100644
index 249b4d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_8 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_9.d
deleted file mode 100644
index 268398c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_9.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_9.java
-.class public dot.junit.opcodes.iget.d.T_iget_9
-.super java/lang/Object
-
-.field public val F
-
-.method <clinit>()V
-.limit regs 2
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()F
-.limit regs 4
-
- const v0, 0
- iget v1, v0, dot.junit.opcodes.iget.d.T_iget_9.val F
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_9.java
deleted file mode 100644
index 440ad6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget/d/T_iget_9.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget.d;
-
-public class T_iget_9 {
-
- public float val = 123.0f;
-
- public float run() {
- return val;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/TestStubs.java
deleted file mode 100644
index 8dcd427..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean;
-
-public class TestStubs {
- // used by testVFE4
- private boolean TestStubField = true;
- // used by testVFE15
- protected boolean TestStubProtectedField = true;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java
deleted file mode 100644
index b23f330..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_11;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_12;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_13;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_21;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_5;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_6;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_7;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_8;
-import dot.junit.opcodes.iget_boolean.d.T_iget_boolean_9;
-
-public class Test_iget_boolean extends DxTestCase {
-
- /**
- * @title get boolean from field
- */
- public void testN1() {
- T_iget_boolean_1 t = new T_iget_boolean_1();
- assertEquals(true, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_11
- T_iget_boolean_11 t = new T_iget_boolean_11();
- assertEquals(true, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_boolean_9 t = new T_iget_boolean_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B13
- * @title read boolean from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_iget_boolean_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_6
- //@uses dot.junit.opcodes.iget_boolean.TestStubs
- try {
- new T_iget_boolean_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_boolean_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_boolean_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_12
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1
- try {
- new T_iget_boolean_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget_boolean shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_boolean shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_boolean shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_boolean shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_boolean shall not work for byte fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_boolean shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_boolean shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read inaccessible protected field.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_21
- //@uses dot.junit.opcodes.iget_boolean.TestStubs
- try {
- new T_iget_boolean_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_5
- //@uses dot.junit.opcodes.iget_boolean.TestStubs
- try {
- new T_iget_boolean_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.d
deleted file mode 100644
index 23b0a93..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_1.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1
-.super java/lang/Object
-
-.field public i1 Z
-.field protected p1 Z
-.field private pvt1 Z
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const/4 v0, 1
- iput-boolean v0, v1, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1.i1 Z
-
- const/16 v0, 1
- iput-boolean v0, v1, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1.p1 Z
-
- const/16 v0, 1
- iput-boolean v0, v1, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1.pvt1 Z
-
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.java
deleted file mode 100644
index b23b780..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_1 {
- public boolean i1 = true;
- protected boolean p1 = true;
- private boolean pvt1 = true;
-
- public boolean run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.d
deleted file mode 100644
index 540ecc5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_11.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_11
-.super dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1.p1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.java
deleted file mode 100644
index 2b2423e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_11 extends T_iget_boolean_1 {
-
- public boolean run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.d
deleted file mode 100644
index e0a918f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_12.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_12
-.super dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1.pvt1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.java
deleted file mode 100644
index 5af996f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_12 extends T_iget_boolean_1 {
-
- @Override
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.d
deleted file mode 100644
index 50ad238..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_13.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_13
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_13.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.java
deleted file mode 100644
index b652090..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_13 {
-
- public void run(){
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_14.d
deleted file mode 100644
index 38a56f6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_14.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_14
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_15.d
deleted file mode 100644
index 9b165d9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_15.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_15
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_16.d
deleted file mode 100644
index 8eb7f27..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_16.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_16
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_17.d
deleted file mode 100644
index 499c796..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_17.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_17
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_18.d
deleted file mode 100644
index ab97074..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_18.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_18
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_18.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_19.d
deleted file mode 100644
index 2909f36..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_19.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_19
-.super java/lang/Object
-
-.field public i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_20.d
deleted file mode 100644
index e37f360..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_20.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_20
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v0, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.d
deleted file mode 100644
index c59f39d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_21.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_boolean/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_boolean/TestStubs/<init>()V
-
- iget-boolean v1, v0, dot.junit.opcodes.iget_boolean.TestStubs.TestStubProtectedField Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.java
deleted file mode 100644
index 74e2da1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_21 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_3.d
deleted file mode 100644
index 7b6f6f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_3.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_3
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-boolean v3, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_3.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30.d
deleted file mode 100644
index 9f30d4d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_30.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_30
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30
- iget-boolean v1, v0, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_30.st_i1 Z
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.d
deleted file mode 100644
index 56747b1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_4.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.dfh
deleted file mode 100644
index a68f88b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 663a47b7
- B7 47 3A 66
-// parsed: offset 12, len 20: signature : 26ba...8627
- 26 BA 95 8C 7D 61 05 BB C8 CD CB 51 38 D9 12 D7 C7 20 86 27
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "Ljava/lang/Object;"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 377 (0x000179) "T_iget_boolean_4.java"
- 79 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 400 (0x000190) "V"
- 90 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 403 (0x000193) "Z"
- 93 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 406 (0x000196) "i1"
- 96 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "run"
- 9A 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "Z"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) type_idx: 3 (0x000003) name_idx: 6 (0x000006) "i1"
- 00 00 03 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_iget_boolean_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 415 (0x00019f)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 9F 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;.i1:Z // field@0000
-//@mod 55 21 00 00
- 55 21 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 53: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 5F 62 6F 6F 6C 65 61 6E 2F 64 2F 54 5F 69 67 65 74 5F 62 6F 6F 6C 65 61 6E 5F 34 3B 00
-// parsed: offset 357, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 377, len 23: TYPE_STRING_DATA_ITEM [3] "T_iget_boolean_4.java"
- 15 54 5F 69 67 65 74 5F 62 6F 6F 6C 65 61 6E 5F 34 2E 6A 61 76 61 00
-// parsed: offset 400, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 403, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 406, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;"
- // parsed: offset 415, len 1: static_fields_size: 0
- 00
- // parsed: offset 416, len 1: instance_fields_size: 1
- 01
- // parsed: offset 417, len 1: direct_methods_size: 1
- 01
- // parsed: offset 418, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 419, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 420, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 421, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 422, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 425, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 427, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 428, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 429, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 431, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 415 (0x00019f)
- 00 20 00 00 01 00 00 00 9F 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.d
deleted file mode 100644
index f9bf929..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_5.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_5
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_5.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.java
deleted file mode 100644
index 5b275aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_5 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.d
deleted file mode 100644
index ae3a118..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_6.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_boolean/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_boolean/TestStubs/<init>()V
-
- iget-boolean v1, v0, dot.junit.opcodes.iget_boolean.TestStubs.TestStubField Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.java
deleted file mode 100644
index 0d91cab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_6 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.d
deleted file mode 100644
index cdec059..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_7.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_7no_class.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.java
deleted file mode 100644
index 3ec333b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_7 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.d
deleted file mode 100644
index fd4ff0a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_8.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- iget-boolean v1, v2, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_8.i1N Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.java
deleted file mode 100644
index b87cf8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_8 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.d
deleted file mode 100644
index 9b2b565..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_boolean_9.java
-.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_9
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- const v0, 0
- iget-boolean v1, v0, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_9.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.java
deleted file mode 100644
index a5261bb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_boolean.d;
-
-public class T_iget_boolean_9 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/TestStubs.java
deleted file mode 100644
index 90b1f13..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte;
-
-public class TestStubs {
- // used by testVFE4
- private byte TestStubField = 50;
- // ussed by testVFE15
- protected byte TestStubProtectedField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java
deleted file mode 100644
index de48192..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_1;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_11;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_12;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_13;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_21;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_5;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_6;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_7;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_8;
-import dot.junit.opcodes.iget_byte.d.T_iget_byte_9;
-
-public class Test_iget_byte extends DxTestCase {
-
- /**
- * @title get byte from field
- */
- public void testN1() {
- T_iget_byte_1 t = new T_iget_byte_1();
- assertEquals(77, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_1
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_11
- T_iget_byte_11 t = new T_iget_byte_11();
- assertEquals(77, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_byte_9 t = new T_iget_byte_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B13
- * @title read byte from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_iget_byte_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_6
- //@uses dot.junit.opcodes.iget_byte.TestStubs
- try {
- new T_iget_byte_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_byte_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_byte_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_12
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_1
- try {
- new T_iget_byte_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_byte shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read inaccessible protected field.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_21
- //@uses dot.junit.opcodes.iget_byte.TestStubs
- try {
- new T_iget_byte_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_5
- //@uses dot.junit.opcodes.iget_byte.TestStubs
- try {
- new T_iget_byte_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.d
deleted file mode 100644
index 6dbe256..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_1.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_1
-.super java/lang/Object
-
-.field public i1 B
-.field protected p1 B
-.field private pvt1 B
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const v0, 77
- iput-byte v0, v1, dot.junit.opcodes.iget_byte.d.T_iget_byte_1.i1 B
-
- const v0, 77
- iput-byte v0, v1, dot.junit.opcodes.iget_byte.d.T_iget_byte_1.p1 B
-
- const v0, 77
- iput-byte v0, v1, dot.junit.opcodes.iget_byte.d.T_iget_byte_1.pvt1 B
-
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_1.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.java
deleted file mode 100644
index 32df19e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_1 {
- public static byte i1 = 77;
- protected static byte p1 = 77;
- private static byte pvt1 = 77;
-
- public byte run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.d
deleted file mode 100644
index 0a13a63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_11.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_11
-.super dot/junit/opcodes/iget_byte/d/T_iget_byte_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_byte/d/T_iget_byte_1/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_1.p1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.java
deleted file mode 100644
index 535c971..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_11 extends T_iget_byte_1 {
-
- public byte run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.d
deleted file mode 100644
index 19d218b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_12.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_12
-.super dot/junit/opcodes/iget_byte/d/T_iget_byte_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_byte/d/T_iget_byte_1/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_1.pvt1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.java
deleted file mode 100644
index 3927a5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_12 extends T_iget_byte_1 {
-
- @Override
- public byte run() {
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.d
deleted file mode 100644
index f09be61..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_13.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_13
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_13.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.java
deleted file mode 100644
index 755b896..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_14.d
deleted file mode 100644
index f33ce5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_14.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_14
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_15.d
deleted file mode 100644
index 4564d6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_15.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_15
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_16.d
deleted file mode 100644
index 0cd45ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_16.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_16
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_17.d
deleted file mode 100644
index fba56a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_17.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_17
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_18.d
deleted file mode 100644
index 309001d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_18.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_18
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_19.d
deleted file mode 100644
index a1397ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_19.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_19
-.super java/lang/Object
-
-.field public i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_20.d
deleted file mode 100644
index 2373e00..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_20.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_20
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v0, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.d
deleted file mode 100644
index 40685ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_21.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_byte/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_byte/TestStubs/<init>()V
-
- iget-byte v1, v0, dot.junit.opcodes.iget_byte.TestStubs.TestStubProtectedField B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.java
deleted file mode 100644
index 10deb39..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_21 {
-
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_3.d
deleted file mode 100644
index a7cf811..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_3.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_3
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-byte v3, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_3.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_30.d
deleted file mode 100644
index 1c8e463..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_30.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_30
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget_byte/d/T_iget_byte_30
- iget-byte v1, v0, dot.junit.opcodes.iget_byte.d.T_iget_byte_30.st_i1 B
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.d
deleted file mode 100644
index 20f03c8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_4.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_4
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_4.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.dfh
deleted file mode 100644
index 26864a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : acfa42dd
- DD 42 FA AC
-// parsed: offset 12, len 20: signature : 3689...2216
- 36 89 53 31 46 F7 82 E5 1D 14 90 9F A4 DE 9A 22 E0 BC 22 16
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "B"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_iget_byte_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "i1"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "run"
- 91 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "B"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "B"
-// return_type_idx: 0 (0x000000) "B"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iget_byte_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 406 (0x000196)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 96 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget_byte.d.T_iget_byte_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget_byte.d.T_iget_byte_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;.i1:B // field@0000
-//@mod 56 21 00 00
- 56 21 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "B"
- 01 42 00
-// parsed: offset 307, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 5F 62 79 74 65 2F 64 2F 54 5F 69 67 65 74 5F 62 79 74 65 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 20: TYPE_STRING_DATA_ITEM [4] "T_iget_byte_4.java"
- 12 54 5F 69 67 65 74 5F 62 79 74 65 5F 34 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 401, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;"
- // parsed: offset 406, len 1: static_fields_size: 0
- 00
- // parsed: offset 407, len 1: instance_fields_size: 1
- 01
- // parsed: offset 408, len 1: direct_methods_size: 1
- 01
- // parsed: offset 409, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 410, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 411, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 412, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 413, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 416, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 419, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 420, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 422, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 406 (0x000196)
- 00 20 00 00 01 00 00 00 96 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.d
deleted file mode 100644
index 65e6ed0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_5.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_5
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_5.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.java
deleted file mode 100644
index 75f7a5c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_5 {
-
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.d
deleted file mode 100644
index 0f761e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_6.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_byte/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_byte/TestStubs/<init>()V
-
- iget-byte v1, v0, dot.junit.opcodes.iget_byte.TestStubs.TestStubField B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.java
deleted file mode 100644
index 20af80f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_6 {
-
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.d
deleted file mode 100644
index a9df70b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_7.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_7no_class.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.java
deleted file mode 100644
index f13071d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_7 {
-
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.d
deleted file mode 100644
index de3b7a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_8.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- iget-byte v1, v2, dot.junit.opcodes.iget_byte.d.T_iget_byte_8.i1N B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.java
deleted file mode 100644
index 6f89bf3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_8 {
-
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.d
deleted file mode 100644
index 96eee86..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_byte_9.java
-.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_9
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- const v0, 0
- iget-byte v1, v0, dot.junit.opcodes.iget_byte.d.T_iget_byte_9.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.java
deleted file mode 100644
index 476ae5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_byte.d;
-
-public class T_iget_byte_9 {
-
- public byte run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/TestStubs.java
deleted file mode 100644
index 5bf73ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char;
-
-public class TestStubs {
- // used by testVFE4
- private char TestStubField = 50;
- // ussed by testVFE15
- protected char TestStubProtectedField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/Test_iget_char.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/Test_iget_char.java
deleted file mode 100644
index c7516e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/Test_iget_char.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget_char.d.T_iget_char_1;
-import dot.junit.opcodes.iget_char.d.T_iget_char_11;
-import dot.junit.opcodes.iget_char.d.T_iget_char_12;
-import dot.junit.opcodes.iget_char.d.T_iget_char_13;
-import dot.junit.opcodes.iget_char.d.T_iget_char_21;
-import dot.junit.opcodes.iget_char.d.T_iget_char_5;
-import dot.junit.opcodes.iget_char.d.T_iget_char_6;
-import dot.junit.opcodes.iget_char.d.T_iget_char_7;
-import dot.junit.opcodes.iget_char.d.T_iget_char_8;
-import dot.junit.opcodes.iget_char.d.T_iget_char_9;
-
-public class Test_iget_char extends DxTestCase {
-
- /**
- * @title get char from field
- */
- public void testN1() {
- T_iget_char_1 t = new T_iget_char_1();
- assertEquals(77, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_1
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_11
- T_iget_char_11 t = new T_iget_char_11();
- assertEquals(77, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_char_9 t = new T_iget_char_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read char from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_iget_char_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError t) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_6
- //@uses dot.junit.opcodes.iget_char.TestStubs
- try {
- new T_iget_char_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError t) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_char_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError t) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_char_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError t) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_12
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_1
- try {
- new T_iget_char_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError t) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget_char shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_char shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_char shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_char shall not work for byte fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_char shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_char shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iget_char shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read inaccessible protected field.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_21
- //@uses dot.junit.opcodes.iget_char.TestStubs
- try {
- new T_iget_char_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError t) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_5
- //@uses dot.junit.opcodes.iget_char.TestStubs
- try {
- new T_iget_char_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError t) {
- // expected
- }
- }
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.d
deleted file mode 100644
index 837dd6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.d
+++ /dev/null
@@ -1,49 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_1.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_1
-.super java/lang/Object
-
-.field public i1 C
-.field protected p1 C
-.field private pvt1 C
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const v0, 77
- iput-char v0, v1, dot.junit.opcodes.iget_char.d.T_iget_char_1.i1 C
-
- const v0, 77
- iput-char v0, v1, dot.junit.opcodes.iget_char.d.T_iget_char_1.p1 C
-
- const v0, 77
- iput-char v0, v1, dot.junit.opcodes.iget_char.d.T_iget_char_1.pvt1 C
-
-
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_1.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.java
deleted file mode 100644
index 227f97a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_1 {
- public char i1 = 77;
- protected char p1 = 77;
- private char pvt1 = 77;
-
- public char run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.d
deleted file mode 100644
index 9d74992..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_11.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_11
-.super dot/junit/opcodes/iget_char/d/T_iget_char_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_char/d/T_iget_char_1/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_1.p1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.java
deleted file mode 100644
index cdd08a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_11 extends T_iget_char_1 {
-
- public char run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.d
deleted file mode 100644
index 5194ff9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_12.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_12
-.super dot/junit/opcodes/iget_char/d/T_iget_char_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_char/d/T_iget_char_1/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_1.pvt1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.java
deleted file mode 100644
index 611b24b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_12 extends T_iget_char_1 {
-
- @Override
- public char run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.d
deleted file mode 100644
index a7f5e58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_13.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_13
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_13.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.java
deleted file mode 100644
index 33cae33..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_14.d
deleted file mode 100644
index 46f0e20..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_14.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_14
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_15.d
deleted file mode 100644
index e8c7195..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_15.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_15
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_16.d
deleted file mode 100644
index 34dbaf0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_16.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_16
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_17.d
deleted file mode 100644
index cde1b06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_17.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_17
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_17.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_18.d
deleted file mode 100644
index f32f364..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_18.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_18
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_19.d
deleted file mode 100644
index 5efa5ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_19.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_19
-.super java/lang/Object
-
-.field public i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_20.d
deleted file mode 100644
index 895f42e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_20.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_20
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v0, v2, dot.junit.opcodes.iget_char.d.T_iget_char_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.d
deleted file mode 100644
index 4902259..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_21.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_char/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_char/TestStubs/<init>()V
-
- iget-char v1, v0, dot.junit.opcodes.iget_char.TestStubs.TestStubProtectedField C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.java
deleted file mode 100644
index 6517824..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_21 {
-
- public char run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_3.d
deleted file mode 100644
index 7838f58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_3.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_3
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-char v3, v2, dot.junit.opcodes.iget_char.d.T_iget_char_3.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_30.d
deleted file mode 100644
index bdc90d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_30.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_30
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget_char/d/T_iget_char_30
- iget-char v1, v0, dot.junit.opcodes.iget_char.d.T_iget_char_30.st_i1 C
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.d
deleted file mode 100644
index 428c14b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_4.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_4
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_4.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.dfh
deleted file mode 100644
index 270fbc7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_char/d/T_iget_char_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_char/d/T_iget_char_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 583643f9
- F9 43 36 58
-// parsed: offset 12, len 20: signature : c593...65f6
- C5 93 2D 56 9E A8 DE 9C EB 9B 10 08 C0 63 49 6A B5 96 65 F6
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "C"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/iget_char/d/T_iget_char_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_iget_char_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "i1"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "run"
- 91 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "C"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iget_char/d/T_iget_char_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "C"
-// return_type_idx: 0 (0x000000) "C"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iget_char/d/T_iget_char_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iget_char_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 406 (0x000196)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 96 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget_char.d.T_iget_char_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget_char.d.T_iget_char_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_4;.i1:C // field@0000
-//@mod 57 21 00 00
- 57 21 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "C"
- 01 43 00
-// parsed: offset 307, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iget_char/d/T_iget_char_4;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 5F 63 68 61 72 2F 64 2F 54 5F 69 67 65 74 5F 63 68 61 72 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 20: TYPE_STRING_DATA_ITEM [4] "T_iget_char_4.java"
- 12 54 5F 69 67 65 74 5F 63 68 61 72 5F 34 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 401, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget_char/d/T_iget_char_4;"
- // parsed: offset 406, len 1: static_fields_size: 0
- 00
- // parsed: offset 407, len 1: instance_fields_size: 1
- 01
- // parsed: offset 408, len 1: direct_methods_size: 1
- 01
- // parsed: offset 409, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 410, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 411, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 412, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 413, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 416, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 419, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 420, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 422, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 406 (0x000196)
- 00 20 00 00 01 00 00 00 96 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.d
deleted file mode 100644
index 534412f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_5.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_5
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_5.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.java
deleted file mode 100644
index 4975e76..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_5 {
-
- public char run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.d
deleted file mode 100644
index 0d208b3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_6.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_char/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_char/TestStubs/<init>()V
-
- iget-char v1, v0, dot.junit.opcodes.iget_char.TestStubs.TestStubField C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.java
deleted file mode 100644
index 8be8c2b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_6 {
-
- public char run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.d
deleted file mode 100644
index b2ca2ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_7.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_7no_class.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.java
deleted file mode 100644
index 4ca80d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_7 {
-
- public char run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.d
deleted file mode 100644
index 7a75de0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_8.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- iget-char v1, v2, dot.junit.opcodes.iget_char.d.T_iget_char_8.i1N C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.java
deleted file mode 100644
index 49d35c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_8 {
-
- public char run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.d
deleted file mode 100644
index 70eca20..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_char_9.java
-.class public dot.junit.opcodes.iget_char.d.T_iget_char_9
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- const v0, 0
- iget-char v1, v0, dot.junit.opcodes.iget_char.d.T_iget_char_9.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.java
deleted file mode 100644
index 6bbe1ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_char.d;
-
-public class T_iget_char_9 {
-
- public char run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/TestStubs.java
deleted file mode 100644
index 0a68e56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object;
-
-public class TestStubs {
- // used by testVFE4
- private Object TestStubField = null;
- // used by testVFE15
- protected Object TestStubProtectedField = null;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/Test_iget_object.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/Test_iget_object.java
deleted file mode 100644
index 3a735b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/Test_iget_object.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget_object.d.T_iget_object_1;
-import dot.junit.opcodes.iget_object.d.T_iget_object_11;
-import dot.junit.opcodes.iget_object.d.T_iget_object_12;
-import dot.junit.opcodes.iget_object.d.T_iget_object_13;
-import dot.junit.opcodes.iget_object.d.T_iget_object_21;
-import dot.junit.opcodes.iget_object.d.T_iget_object_22;
-import dot.junit.opcodes.iget_object.d.T_iget_object_5;
-import dot.junit.opcodes.iget_object.d.T_iget_object_6;
-import dot.junit.opcodes.iget_object.d.T_iget_object_7;
-import dot.junit.opcodes.iget_object.d.T_iget_object_8;
-import dot.junit.opcodes.iget_object.d.T_iget_object_9;
-
-public class Test_iget_object extends DxTestCase {
-
- /**
- * @title get reference from field
- */
- public void testN1() {
- T_iget_object_1 t = new T_iget_object_1();
- assertEquals(null, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_1
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_11
- T_iget_object_11 t = new T_iget_object_11();
- assertEquals(null, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_object_9 t = new T_iget_object_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title (read object from long field - only field with same name but
- * different type exists)
- */
- public void testVFE3() {
- try {
- new T_iget_object_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_6
- //@uses dot.junit.opcodes.iget_object.TestStubs
- try {
- new T_iget_object_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_object_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_object_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_12
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_1
- try {
- new T_iget_object_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget_object shall not work for short fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_object shall not work for char fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_object shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_object shall not work for byte fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_object shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_object shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_object shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title only field of different type exists
- */
- public void testVFE15() {
- try {
- new T_iget_object_21().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read inaccessible protected field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_22
- //@uses dot.junit.opcodes.iget_object.TestStubs
- try {
- new T_iget_object_22().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE17() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_5
- //@uses dot.junit.opcodes.iget_object.TestStubs
- try {
- new T_iget_object_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_1.d
deleted file mode 100644
index 5e4967f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_1.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_1.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_1
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-.field protected p1 Ljava/lang/Object;
-.field private pvt1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const v0, 0
- iput-object v0, v1, dot.junit.opcodes.iget_object.d.T_iget_object_1.i1 Ljava/lang/Object;
-
- const v0, 0
- iput-object v0, v1, dot.junit.opcodes.iget_object.d.T_iget_object_1.p1 Ljava/lang/Object;
-
- const v0, 0
- iput-object v0, v1, dot.junit.opcodes.iget_object.d.T_iget_object_1.pvt1 Ljava/lang/Object;
-
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_1.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_1.java
deleted file mode 100644
index a063f8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_1 {
- public Object i1 = null;
- protected Object p1 = null;
- private Object pvt1 = null;
-
- public Object run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.d
deleted file mode 100644
index 35a2de0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_11.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_11
-.super dot/junit/opcodes/iget_object/d/T_iget_object_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_object/d/T_iget_object_1/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_1.p1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.java
deleted file mode 100644
index 5fdf44a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_11 extends T_iget_object_1 {
-
- public Object run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.d
deleted file mode 100644
index b2d7400..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_12.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_12
-.super dot/junit/opcodes/iget_object/d/T_iget_object_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_object/d/T_iget_object_1/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_1.pvt1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.java
deleted file mode 100644
index f98c36a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_12 extends T_iget_object_1 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.d
deleted file mode 100644
index 21414cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_13.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_13
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_13.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.java
deleted file mode 100644
index 85a8761..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_14.d
deleted file mode 100644
index df2581c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_14.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_14
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_14.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_15.d
deleted file mode 100644
index 313ec7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_15.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_15
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_15.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_16.d
deleted file mode 100644
index d9df4aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_16.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_16
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_17.d
deleted file mode 100644
index 82cb90e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_17.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_17
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_17.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_18.d
deleted file mode 100644
index 3dac91f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_18.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_18
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_19.d
deleted file mode 100644
index 19a9277..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_19.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_19
-.super java/lang/Object
-
-.field public i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_20.d
deleted file mode 100644
index 71751fb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_20.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_20
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v0, v2, dot.junit.opcodes.iget_object.d.T_iget_object_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_21.d
deleted file mode 100644
index 10143a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_21.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_21.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_21
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- new-instance v0, java/lang/Object
- invoke-direct {v0}, java/lang/Object/<init>()V
-
- iput-object v0, v1, dot.junit.opcodes.iget_object.d.T_iget_object_21.i1 Ljava/lang/Object;
-
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_21.i1 Ljava/lang/String;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_21.java
deleted file mode 100644
index e301893..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_21 {
-
- public String run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.d
deleted file mode 100644
index 2858934..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_22.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_22
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_object/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_object/TestStubs/<init>()V
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.TestStubs.TestStubProtectedField Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.java
deleted file mode 100644
index d9ad933..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_22 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_3.d
deleted file mode 100644
index 4999f1a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_3.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_3
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-object v3, v2, dot.junit.opcodes.iget_object.d.T_iget_object_3.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_30.d
deleted file mode 100644
index 621f235..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_30.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_30
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget_object/d/T_iget_object_30
- iget-object v1, v0, dot.junit.opcodes.iget_object.d.T_iget_object_30.st_i1 Ljava/lang/Object;
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_4.d
deleted file mode 100644
index 9a05156..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_4.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_4
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_4.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_4.dfh
deleted file mode 100644
index a031623..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_4.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_object/d/T_iget_object_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_object/d/T_iget_object_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 70da44ea
- EA 44 DA 70
-// parsed: offset 12, len 20: signature : 6c85...f80f
- 6C 85 8D 3C F4 BD 5A AF 3C BC 06 C0 24 6F AA 65 52 1A F8 0F
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 156 (0x00009c)
- 9C 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 188 (0x0000bc)
- BC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 212 (0x0000d4)
- D4 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 244 (0x0000f4)
- F4 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 292 (0x000124) "<init>"
- 24 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 300 (0x00012c) "L"
- 2C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 303 (0x00012f) "Ldot/junit/opcodes/iget_object/d/T_iget_object_4;"
- 2F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_iget_object_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "V"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 399 (0x00018f) "i1"
- 8F 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "run"
- 93 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iget_object/d/T_iget_object_4;"
- 02 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 156, len 12: [0]
-// shorty_idx: 1 (0x000001) "L"
-// return_type_idx: 1 (0x000001) "Ljava/lang/Object;"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 00 00 00 00
-// parsed: offset 168, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 180, len 8: [0] class_idx: 0 (0x000000) type_idx: 1 (0x000001) name_idx: 6 (0x000006) "i1"
- 00 00 01 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 188, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 196, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 204, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 212, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/iget_object/d/T_iget_object_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iget_object_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 408 (0x000198)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 98 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget_object.d.T_iget_object_4.<init>"
- // parsed: offset 244, len 2: registers_size: 1
- 01 00
- // parsed: offset 246, len 2: ins_size: 1
- 01 00
- // parsed: offset 248, len 2: outs_size: 1
- 01 00
- // parsed: offset 250, len 2: tries_size: 0
- 00 00
- // parsed: offset 252, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 256, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 260, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 266, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget_object.d.T_iget_object_4.run"
- // parsed: offset 268, len 2: registers_size: 3
- 03 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 0
- 00 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 284, len 4: |0000: iget-object v1, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_4;.i1:Ljava/lang/Object; // field@0000
-//@mod 54 21 00 00
- 54 21 00 01
- // parsed: offset 288, len 2: |0002: return-object v1
- 11 01
- // tries:
- // handlers:
-// parsed: offset 290, len 2: PADDING
- 00 00
-// parsed: offset 292, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 300, len 3: TYPE_STRING_DATA_ITEM [1] "L"
- 01 4C 00
-// parsed: offset 303, len 51: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iget_object/d/T_iget_object_4;"
- 31 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 5F 6F 62 6A 65 63 74 2F 64 2F 54 5F 69 67 65 74 5F 6F 62 6A 65 63 74 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 22: TYPE_STRING_DATA_ITEM [4] "T_iget_object_4.java"
- 14 54 5F 69 67 65 74 5F 6F 62 6A 65 63 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 396, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 399, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 403, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget_object/d/T_iget_object_4;"
- // parsed: offset 408, len 1: static_fields_size: 0
- 00
- // parsed: offset 409, len 1: instance_fields_size: 1
- 01
- // parsed: offset 410, len 1: direct_methods_size: 1
- 01
- // parsed: offset 411, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 412, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 413, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 244 (0x0000f4)
- F4 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 268 (0x00010c)
- 8C 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 144 (0x000090)
- 02 00 00 00 03 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 156 (0x00009c)
- 03 00 00 00 02 00 00 00 9C 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 180 (0x0000b4)
- 04 00 00 00 01 00 00 00 B4 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 188 (0x0000bc)
- 05 00 00 00 03 00 00 00 BC 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 212 (0x0000d4)
- 06 00 00 00 01 00 00 00 D4 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 244 (0x0000f4)
- 01 20 00 00 02 00 00 00 F4 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 292 (0x000124)
- 02 20 00 00 08 00 00 00 24 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 408 (0x000198)
- 00 20 00 00 01 00 00 00 98 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_5.d
deleted file mode 100644
index ed15e90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_5.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_5
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_5.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_5.java
deleted file mode 100644
index 3626499..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_5 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.d
deleted file mode 100644
index e9082e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_6.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_object/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_object/TestStubs/<init>()V
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.TestStubs.TestStubField Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.java
deleted file mode 100644
index a4ba515..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_6 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.d
deleted file mode 100644
index db5f6f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_7.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_7no_class.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.java
deleted file mode 100644
index 2940ca4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_7 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.d
deleted file mode 100644
index 67f7b82..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_8.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- iget-object v1, v2, dot.junit.opcodes.iget_object.d.T_iget_object_8.i1N Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.java
deleted file mode 100644
index 3b5c4d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_8 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_9.d
deleted file mode 100644
index 7899b37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_object_9.java
-.class public dot.junit.opcodes.iget_object.d.T_iget_object_9
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- const v0, 0
- iget-object v1, v0, dot.junit.opcodes.iget_object.d.T_iget_object_9.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_9.java
deleted file mode 100644
index 7ff752e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_object/d/T_iget_object_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_object.d;
-
-public class T_iget_object_9 {
-
- public Object run(){
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/TestStubs.java
deleted file mode 100644
index 8580ec3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short;
-
-public class TestStubs {
- // used by testVFE4
- private short TestStubField = 50;
- // used by testVFE15
- protected short TestStubProtectedField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/Test_iget_short.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/Test_iget_short.java
deleted file mode 100644
index a7d3658..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/Test_iget_short.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget_short.d.T_iget_short_1;
-import dot.junit.opcodes.iget_short.d.T_iget_short_11;
-import dot.junit.opcodes.iget_short.d.T_iget_short_12;
-import dot.junit.opcodes.iget_short.d.T_iget_short_13;
-import dot.junit.opcodes.iget_short.d.T_iget_short_21;
-import dot.junit.opcodes.iget_short.d.T_iget_short_5;
-import dot.junit.opcodes.iget_short.d.T_iget_short_6;
-import dot.junit.opcodes.iget_short.d.T_iget_short_7;
-import dot.junit.opcodes.iget_short.d.T_iget_short_8;
-import dot.junit.opcodes.iget_short.d.T_iget_short_9;
-
-public class Test_iget_short extends DxTestCase {
-
- /**
- * @title get short from field
- */
- public void testN1() {
- T_iget_short_1 t = new T_iget_short_1();
- assertEquals(32000, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_1
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_11
- T_iget_short_11 t = new T_iget_short_11();
- assertEquals(32000, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_short_9 t = new T_iget_short_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read short from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_iget_short_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_6
- //@uses dot.junit.opcodes.iget_short.TestStubs
- try {
- new T_iget_short_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_short_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_short_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_12
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_1
- try {
- new T_iget_short_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget_short shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_short shall not work for char fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_short shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_short shall not work for byte fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_short shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_short shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget_short shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read inaccessible protected field.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_21
- //@uses dot.junit.opcodes.iget_short.TestStubs
- try {
- new T_iget_short_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_5
- //@uses dot.junit.opcodes.iget_short.TestStubs
- try {
- new T_iget_short_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.d
deleted file mode 100644
index 822f09e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_1.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_1
-.super java/lang/Object
-
-.field public i1 S
-.field protected p1 S
-.field private pvt1 S
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- const v0, 32000
- iput-short v0, v1, dot.junit.opcodes.iget_short.d.T_iget_short_1.i1 S
-
- const v0, 32000
- iput-short v0, v1, dot.junit.opcodes.iget_short.d.T_iget_short_1.p1 S
-
- const v0, 32000
- iput-short v0, v1, dot.junit.opcodes.iget_short.d.T_iget_short_1.pvt1 S
-
-
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_1.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.java
deleted file mode 100644
index d70b7a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_1 {
- public short i1 = 32000;
- protected short p1 = 32000;
- private short pvt1 = 32000;
-
- public short run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.d
deleted file mode 100644
index 0dfd2f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_11.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_11
-.super dot/junit/opcodes/iget_short/d/T_iget_short_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_short/d/T_iget_short_1/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_1.p1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.java
deleted file mode 100644
index 0fd12c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_11 extends T_iget_short_1 {
-
- public short run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.d
deleted file mode 100644
index e47f6a6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_12.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_12
-.super dot/junit/opcodes/iget_short/d/T_iget_short_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_short/d/T_iget_short_1/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_1.pvt1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.java
deleted file mode 100644
index be322f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_12 extends T_iget_short_1 {
-
- @Override
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.d
deleted file mode 100644
index 22a94a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_13.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_13
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_13.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.java
deleted file mode 100644
index 3b27d6c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_13 {
-
- public void run(){
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_14.d
deleted file mode 100644
index 9e0367a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_14.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_14
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_15.d
deleted file mode 100644
index cf1fbf5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_15.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_15
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_15.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_16.d
deleted file mode 100644
index 635640a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_16.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_16
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_17.d
deleted file mode 100644
index 6a717be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_17.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_17
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_17.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_18.d
deleted file mode 100644
index 70dda5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_18.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_18
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_19.d
deleted file mode 100644
index cdaa952..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_19.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_19
-.super java/lang/Object
-
-.field public i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_20.d
deleted file mode 100644
index 5568f60..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_20.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_20
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v0, v2, dot.junit.opcodes.iget_short.d.T_iget_short_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d
deleted file mode 100644
index eff1f49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_21.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_short/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_short/TestStubs/<init>()V
-
- iget-wide v1, v0, dot.junit.opcodes.iget_short.TestStubs.TestStubProtectedField S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.java
deleted file mode 100644
index 5bb7f6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_21 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_3.d
deleted file mode 100644
index 0de7441..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_3.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_3
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-short v3, v2, dot.junit.opcodes.iget_short.d.T_iget_short_3.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_30.d
deleted file mode 100644
index bc8bc9f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_30.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_30
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget_short/d/T_iget_short_30
- iget-short v1, v0, dot.junit.opcodes.iget_short.d.T_iget_short_30.st_i1 S
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.d
deleted file mode 100644
index 9e2ffb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_4.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_4
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_4.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.dfh
deleted file mode 100644
index 3716e2a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_short/d/T_iget_short_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_short/d/T_iget_short_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 636b4534
- 34 45 6B 63
-// parsed: offset 12, len 20: signature : 7e12...b877
- 7E 12 BB A2 6A C1 65 67 56 AC 7C 83 C7 BA 11 D9 23 22 B8 77
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "Ldot/junit/opcodes/iget_short/d/T_iget_short_4;"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 353 (0x000161) "Ljava/lang/Object;"
- 61 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 373 (0x000175) "S"
- 75 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 376 (0x000178) "T_iget_short_4.java"
- 78 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 400 (0x000190) "i1"
- 90 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 404 (0x000194) "run"
- 94 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/iget_short/d/T_iget_short_4;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "S"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 3 (0x000003) "S"
-// return_type_idx: 2 (0x000002) "S"
-// parameters_off: 0 (0x000000)
- 03 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) type_idx: 2 (0x000002) name_idx: 6 (0x000006) "i1"
- 00 00 02 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/iget_short/d/T_iget_short_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iget_short_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 409 (0x000199)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 99 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget_short.d.T_iget_short_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget_short.d.T_iget_short_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_4;.i1:S // field@0000
-//@mod 58 21 00 00
- 58 21 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 49: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/iget_short/d/T_iget_short_4;"
- 2F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 5F 73 68 6F 72 74 2F 64 2F 54 5F 69 67 65 74 5F 73 68 6F 72 74 5F 34 3B 00
-// parsed: offset 353, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 373, len 3: TYPE_STRING_DATA_ITEM [3] "S"
- 01 53 00
-// parsed: offset 376, len 21: TYPE_STRING_DATA_ITEM [4] "T_iget_short_4.java"
- 13 54 5F 69 67 65 74 5F 73 68 6F 72 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 400, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 404, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget_short/d/T_iget_short_4;"
- // parsed: offset 409, len 1: static_fields_size: 0
- 00
- // parsed: offset 410, len 1: instance_fields_size: 1
- 01
- // parsed: offset 411, len 1: direct_methods_size: 1
- 01
- // parsed: offset 412, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 413, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 414, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 415, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 416, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 419, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 421, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 422, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 423, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 425, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 409 (0x000199)
- 00 20 00 00 01 00 00 00 99 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.d
deleted file mode 100644
index ac92c40..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_5.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_5
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_5.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.java
deleted file mode 100644
index 37c4351..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_5 {
-
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.d
deleted file mode 100644
index 764d42e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_6.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.TestStubs.TestStubField S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.java
deleted file mode 100644
index 5ac127b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_6 {
-
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.d
deleted file mode 100644
index 3a042d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_7.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_7no_class.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.java
deleted file mode 100644
index 7c81be5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_7 {
-
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.d
deleted file mode 100644
index 129d2e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_8.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- iget-short v1, v2, dot.junit.opcodes.iget_short.d.T_iget_short_8.i1N S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.java
deleted file mode 100644
index f22a81e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_8 {
-
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.d
deleted file mode 100644
index 8721333..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_short_9.java
-.class public dot.junit.opcodes.iget_short.d.T_iget_short_9
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- const v0, 0
- iget-short v1, v0, dot.junit.opcodes.iget_short.d.T_iget_short_9.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.java
deleted file mode 100644
index 178efc7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_short.d;
-
-public class T_iget_short_9 {
-
- public short run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/TestStubs.java
deleted file mode 100644
index f90a470..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/TestStubs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide;
-
-public class TestStubs {
- // used by testVFE4
- private long TestStubField = 50;
- // ussed by testVFE15
- protected long TestStubProtectedField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java
deleted file mode 100644
index 7e42d32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_1;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_11;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_12;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_13;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_2;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_21;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_5;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_6;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_7;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_8;
-import dot.junit.opcodes.iget_wide.d.T_iget_wide_9;
-
-public class Test_iget_wide extends DxTestCase {
-
- /**
- * @title type - long
- */
- public void testN1() {
- T_iget_wide_1 t = new T_iget_wide_1();
- assertEquals(12345679890123l, t.run());
- }
-
- /**
- * @title type - double
- */
- public void testN2() {
- T_iget_wide_2 t = new T_iget_wide_2();
- assertEquals(123.0, t.run());
- }
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_1
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_11
- T_iget_wide_11 t = new T_iget_wide_11();
- assertEquals(10, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iget_wide_9 t = new T_iget_wide_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read long from integer field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_iget_wide_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_6
- //@uses dot.junit.opcodes.iget_wide.TestStubs
- try {
- new T_iget_wide_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_iget_wide_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_iget_wide_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_12
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_1
- try {
- new T_iget_wide_12().run();
- fail("expected a IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint B1
- * @title iget-wide shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget-wide shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget-wide shall not work for boolean fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget-wide shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget-wide shall not work for byte fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget-wide shall not work for float fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iget-wide shall not work for int fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to read inaccessible protected field.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_21
- //@uses dot.junit.opcodes.iget_wide.TestStubs
- try {
- new T_iget_wide_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title Attempt to read static field.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_5
- //@uses dot.junit.opcodes.iget_wide.TestStubs
- try {
- new T_iget_wide_5().run();
- fail("expected a IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_1.d
deleted file mode 100644
index 3919e04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_1.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_1.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_1
-.super java/lang/Object
-
-.field public i1 J
-.field protected p1 J
-.field private pvt1 J
-
-
-.method public <init>()V
-.limit regs 3
-
- invoke-direct {v2}, java/lang/Object/<init>()V
-
- const-wide v0, 12345679890123
- iput-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_1.i1 J
-
- const-wide v0, 10
- iput-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_1.p1 J
-
- const-wide v0, 20
- iput-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_1.pvt1 J
-
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v1, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_1.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_1.java
deleted file mode 100644
index 309671d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_1 {
- public long i1 = 12345679890123l;
- protected long p1 = 10;
- private long pvt1 = 20;
-
- public long run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.d
deleted file mode 100644
index 9a6f454..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_11.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_11
-.super dot/junit/opcodes/iget_wide/d/T_iget_wide_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_wide/d/T_iget_wide_1/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v1, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_1.p1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.java
deleted file mode 100644
index c93589e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_11 extends T_iget_wide_1 {
-
- public long run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.d
deleted file mode 100644
index 9a2cc44..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_12.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_12
-.super dot/junit/opcodes/iget_wide/d/T_iget_wide_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iget_wide/d/T_iget_wide_1/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v1, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_1.pvt1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.java
deleted file mode 100644
index af3cbda..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_12 extends T_iget_wide_1 {
-
- @Override
- public long run() {
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.d
deleted file mode 100644
index 63affb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_13.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_13
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_13.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.java
deleted file mode 100644
index 98086a6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_14.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_14.d
deleted file mode 100644
index 3ffdc18..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_14.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_14
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_15.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_15.d
deleted file mode 100644
index 5b7424b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_15.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_15
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_16.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_16.d
deleted file mode 100644
index ce37389..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_16.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_16
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_16.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_17.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_17.d
deleted file mode 100644
index 1181a48..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_17.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_17
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_18.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_18.d
deleted file mode 100644
index 03c2a0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_18.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_18
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_18.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_19.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_19.d
deleted file mode 100644
index 1978e12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_19.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_19
-.super java/lang/Object
-
-.field public i1 F
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_19.i1 F
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.d
deleted file mode 100644
index 16f9f5a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_2.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_2
-.super java/lang/Object
-
-.field public val D
-
-.method public <init>()V
-.limit regs 3
-
- invoke-direct {v2}, java/lang/Object/<init>()V
-
- const-wide v0, 123.0
- iput-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_2.val D
-
- return-void
-.end method
-
-.method public run()D
-.limit regs 4
-
- iget-wide v1, v3, dot.junit.opcodes.iget_wide.d.T_iget_wide_2.val D
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.java
deleted file mode 100644
index 726f4b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_2 {
-
- public double val = 123.0d;
-
- public double run() {
- return val;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_20.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_20.d
deleted file mode 100644
index 1f3e225..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_20.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_20
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_20.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.d
deleted file mode 100644
index fea700d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_21.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_wide/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_wide/TestStubs/<init>()V
-
- iget-wide v1, v0, dot.junit.opcodes.iget_wide.TestStubs.TestStubProtectedField J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.java
deleted file mode 100644
index affeadf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_21 {
-
- public long run() {
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_3.d
deleted file mode 100644
index bb7026e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_3.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_3
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iget-wide v3, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_3.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_30.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_30.d
deleted file mode 100644
index 432f376..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_30.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_30.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_30
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iget_wide/d/T_iget_wide_30
- iget-wide v1, v0, dot.junit.opcodes.iget_wide.d.T_iget_wide_30.st_i1 J
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.d
deleted file mode 100644
index 8dd2d4e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_4.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_4
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v1, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_4.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.dfh
deleted file mode 100644
index 489efd2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 1ffd428b
- 8B 42 FD 1F
-// parsed: offset 12, len 20: signature : 2608...94cb
- 26 08 93 C5 49 69 AF 88 0D C9 EC 21 52 81 36 4E CA 50 94 CB
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "J"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_iget_wide_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "i1"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "run"
- 91 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "J"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "J"
-// return_type_idx: 0 (0x000000) "J"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iget_wide_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 406 (0x000196)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 96 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iget_wide.d.T_iget_wide_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iget_wide.d.T_iget_wide_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: iget-wide v1, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;.i1:J // field@0000
-//@mod 53 21 00 00
- 53 21 00 01
- // parsed: offset 292, len 2: |0002: return-wide v1
- 10 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "J"
- 01 4A 00
-// parsed: offset 307, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 67 65 74 5F 77 69 64 65 2F 64 2F 54 5F 69 67 65 74 5F 77 69 64 65 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 20: TYPE_STRING_DATA_ITEM [4] "T_iget_wide_4.java"
- 12 54 5F 69 67 65 74 5F 77 69 64 65 5F 34 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 401, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;"
- // parsed: offset 406, len 1: static_fields_size: 0
- 00
- // parsed: offset 407, len 1: instance_fields_size: 1
- 01
- // parsed: offset 408, len 1: direct_methods_size: 1
- 01
- // parsed: offset 409, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 410, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 411, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 412, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 413, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 416, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 419, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 420, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 422, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 406 (0x000196)
- 00 20 00 00 01 00 00 00 96 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.d
deleted file mode 100644
index cab5c10..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_5.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_5
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v1, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_5.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.java
deleted file mode 100644
index c4c130e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_5 {
-
- public long run() {
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.d
deleted file mode 100644
index ba13f26..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_6.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iget_wide/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iget_wide/TestStubs/<init>()V
-
- iget-wide v1, v0, dot.junit.opcodes.iget_wide.TestStubs.TestStubField J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.java
deleted file mode 100644
index 649795f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_6 {
-
- public long run() {
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.d
deleted file mode 100644
index 572fdbe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_7.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_7no_class.i1 J
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.java
deleted file mode 100644
index 0866645..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_7 {
-
- public long run() {
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.d
deleted file mode 100644
index 96b8c56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_8.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- iget-wide v1, v2, dot.junit.opcodes.iget_wide.d.T_iget_wide_8.i1N J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.java
deleted file mode 100644
index 570764d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_8 {
-
- public long run() {
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.d b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.d
deleted file mode 100644
index 3cb12cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iget_wide_9.java
-.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_9
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- const v0, 0
- iget-wide v1, v0, dot.junit.opcodes.iget_wide.d.T_iget_wide_9.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.java b/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.java
deleted file mode 100644
index 6999d93..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iget_wide.d;
-
-public class T_iget_wide_9 {
-
- public long run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java
deleted file mode 100644
index 9867d92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.instance_of;
-
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java
deleted file mode 100644
index b0a6cc6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.instance_of;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.instance_of.d.T_instance_of_1;
-import dot.junit.opcodes.instance_of.d.T_instance_of_2;
-import dot.junit.opcodes.instance_of.d.T_instance_of_3;
-import dot.junit.opcodes.instance_of.d.T_instance_of_7;
-
-public class Test_instance_of extends DxTestCase {
-
-
- /**
- * @title (Object)String instanceof String
- */
- public void testN1() {
- T_instance_of_1 t = new T_instance_of_1();
- String s = "";
- assertTrue(t.run(s));
- }
-
- /**
- * @title null instanceof String
- */
- public void testN2() {
- T_instance_of_1 t = new T_instance_of_1();
- assertFalse(t.run(null));
- }
-
- /**
- * @title check assignment compatibility rules
- */
- public void testN4() {
- T_instance_of_2 t = new T_instance_of_2();
- assertTrue(t.run());
- }
-
- /**
- * @title T_instance_of_1 instanceof String
- */
- public void testE1() {
- T_instance_of_1 t = new T_instance_of_1();
- assertFalse(t.run(t));
- }
-
- /**
- * @title Attempt to access inaccessible class.
- */
- public void testE2() {
- //@uses dot.junit.opcodes.instance_of.TestStubs
- //@uses dot.junit.opcodes.instance_of.d.T_instance_of_3
- try {
- T_instance_of_3 tt = new T_instance_of_3();
- tt.run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError e) {
- }
- }
-
- /**
- * @title Attempt to access undefined class.
- */
- public void testE3() {
- try {
- T_instance_of_7 tt = new T_instance_of_7();
- tt.run();
- fail("expected a verification exception");
- } catch (NoClassDefFoundError e) {
- // expected
- } catch(VerifyError e) {
- // expected
- }
- }
-
- /**
- * @constraint A19
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_1.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_1.d
deleted file mode 100644
index 4741d35..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_1.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)Z
-.limit regs 5
-
- instance-of v0, v4, java/lang/String
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_1.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_1.java
deleted file mode 100644
index bd9118a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.instance_of.d;
-
-public class T_instance_of_1 {
-
- public boolean run(Object o) {
- return o instanceof String;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_2.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_2.d
deleted file mode 100644
index 1299b54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_2.d
+++ /dev/null
@@ -1,119 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestStubs.java
-.interface public dot.junit.opcodes.instance_of.d.T_instance_of_2.SuperInterface
-
-.source TestStubs.java
-.interface public dot.junit.opcodes.instance_of.d.T_instance_of_2.SuperInterface2
-
-.source TestStubs.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_2.SuperClass
-.super java/lang/Object
-.implements dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperInterface
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.source TestStubs.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_2.SubClass
-.super dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass/<init>()V
- return-void
-.end method
-
-
-.source T_instance_of_2.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 20
-
- const v0, 0
-
-; (SubClass instanceof SuperClass)
- new-instance v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass
- invoke-direct {v10}, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass/<init>()V
- instance-of v15, v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass
- if-eqz v15, LabelExit
-
-; (SubClass[] instanceof SuperClass[])
- const v11, 1
- new-array v10, v11, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass;
- instance-of v15, v10, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass;
- if-eqz v15, LabelExit
-
-; (SubClass[] instanceof Object)
- new-array v10, v11, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass;
- instance-of v15, v10, java/lang/Object
- if-eqz v15, LabelExit
-
-; (SubClass instanceof SuperInterface)
- new-instance v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass
- invoke-direct {v10}, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass/<init>()V
- instance-of v15, v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperInterface
- if-eqz v15, LabelExit
-
-; !(SuperClass instanceof SubClass)
- new-instance v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass
- invoke-direct {v10}, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass/<init>()V
- instance-of v15, v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass
- if-nez v15, LabelExit
-
-; !(SubClass instanceof SuperInterface2)
- new-instance v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass
- invoke-direct {v10}, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass/<init>()V
- instance-of v15, v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperInterface2
- if-nez v15, LabelExit
-
-; !(SubClass[] instanceof SuperInterface)
- new-array v10, v11, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass;
- instance-of v15, v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SuperInterface
- if-nez v15, LabelExit
-
-; !(SubClass[] instanceof SubClass)
- new-array v10, v11, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass;
- instance-of v15, v10, dot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass
- if-nez v15, LabelExit
-
-; !(SuperClass[] instanceof SubClass[])
- new-array v10, v11, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SuperClass;
- instance-of v15, v10, [Ldot/junit/opcodes/instance_of/d/T_instance_of_2/SubClass;
- if-nez v15, LabelExit
-
- const v0, 1
-
-LabelExit:
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_2.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_2.java
deleted file mode 100644
index e7f1940..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.instance_of.d;
-
-public class T_instance_of_2 {
-
- public boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d
deleted file mode 100644
index 6705dcf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_3.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
- instance-of v0, v5, dot/junit/opcodes/instance_of/TestStubs
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.java
deleted file mode 100644
index 65a0165..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.instance_of.d;
-
-public class T_instance_of_3 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_4.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_4.d
deleted file mode 100644
index fe8b891..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_4.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
-
- instance-of v0, v4, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_4.dfh
deleted file mode 100644
index cec381b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_4.dfh
+++ /dev/null
@@ -1,264 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/instance_of/d/T_instance_of_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/instance_of/d/T_instance_of_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 66154a36
- 36 4A 15 66
-// parsed: offset 12, len 20: signature : 2821...ff3e
- 28 21 65 D6 F8 0F AB 2B 99 4B 13 E4 29 66 87 41 09 61 FF 3E
-// parsed: offset 32, len 4: file_size : 580
- 44 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 444 (0x0001bc)
- BC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 340
- 54 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 294 (0x000126) "<init>"
- 26 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 302 (0x00012e) "Ldot/junit/opcodes/instance_of/d/T_instance_of_4;"
- 2E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 353 (0x000161) "Ljava/lang/Object;"
- 61 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 373 (0x000175) "Ljava/lang/String;"
- 75 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 393 (0x000189) "T_instance_of_4.java"
- 89 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 415 (0x00019f) "V"
- 9F 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 418 (0x0001a2) "VL"
- A2 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 422 (0x0001a6) "run"
- A6 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/instance_of/d/T_instance_of_4;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/String;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "VL"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 288 (0x000120)
- 06 00 00 00 03 00 00 00 20 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/instance_of/d/T_instance_of_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_instance_of_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 427 (0x0001ab)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 AB 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.instance_of.d.T_instance_of_4.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.instance_of.d.T_instance_of_4.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 280, len 4: |0000: instance-of v0, v4, Ljava/lang/String; // class@0002
-//@mod 20 40 02 00
- 20 40 02 01
- // parsed: offset 284, len 2: |0002: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 286, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 288, len 4: size: 1
- 01 00 00 00
- // parsed: offset 292, len 2: type_item [0] type_idx: 1
- 01 00
-// parsed: offset 294, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 302, len 51: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/instance_of/d/T_instance_of_4;"
- 31 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 73 74 61 6E 63 65 5F 6F 66 2F 64 2F 54 5F 69 6E 73 74 61 6E 63 65 5F 6F 66 5F 34 3B 00
-// parsed: offset 353, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 373, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 393, len 22: TYPE_STRING_DATA_ITEM [4] "T_instance_of_4.java"
- 14 54 5F 69 6E 73 74 61 6E 63 65 5F 6F 66 5F 34 2E 6A 61 76 61 00
-// parsed: offset 415, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 418, len 4: TYPE_STRING_DATA_ITEM [6] "VL"
- 02 56 4C 00
-// parsed: offset 422, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/instance_of/d/T_instance_of_4;"
- // parsed: offset 427, len 1: static_fields_size: 0
- 00
- // parsed: offset 428, len 1: instance_fields_size: 0
- 00
- // parsed: offset 429, len 1: direct_methods_size: 1
- 01
- // parsed: offset 430, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 431, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 432, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 435, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 437, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 438, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 439, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 441, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 444, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 448, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 460, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 472, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 484, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 496, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 508, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 520, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 532, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 288 (0x000120)
- 01 10 00 00 01 00 00 00 20 01 00 00
- // parsed: offset 544, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 294 (0x000126)
- 02 20 00 00 08 00 00 00 26 01 00 00
- // parsed: offset 556, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 427 (0x0001ab)
- 00 20 00 00 01 00 00 00 AB 01 00 00
- // parsed: offset 568, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 444 (0x0001bc)
- 00 10 00 00 01 00 00 00 BC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_5.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_5.d
deleted file mode 100644
index eac21b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_5.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
- const v3, 1234
- instance-of v1, v3, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_6.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_6.d
deleted file mode 100644
index 4c2e649..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_6.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
-
- instance-of v0, v5, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_7.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_7.d
deleted file mode 100644
index f0823e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_7.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- instance-of v0, v5, dot/junit/opcodes/instance_of/Test_instance_ofN
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_7.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_7.java
deleted file mode 100644
index adcd6f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.instance_of.d;
-
-public class T_instance_of_7 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_8.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_8.d
deleted file mode 100644
index 2853ade..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_instance_of_8.java
-.class public dot.junit.opcodes.instance_of.d.T_instance_of_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
- const-wide v0, 1234
- check-cast v0, java/lang/String
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java
deleted file mode 100644
index 55e07fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.int_to_byte.d.T_int_to_byte_1;
-import dot.junit.opcodes.int_to_byte.d.T_int_to_byte_5;
-
-
-public class Test_int_to_byte extends DxTestCase {
- /**
- * @title Argument = 1
- */
- public void testN1() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN2() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(-1, t.run(-1));
- }
-
- /**
- * @title Argument = 16
- */
- public void testN3() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(16, t.run(16));
- }
-
- /**
- * @title Argument = -32
- */
- public void testN4() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(-32, t.run(-32));
- }
-
- /**
- * @title Argument = 134
- */
- public void testN5() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(-122, t.run(134));
- }
-
-
- /**
- * @title Argument = -134
- */
- public void testN6() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(122, t.run(-134));
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of float to byte makes no sense but shall not crash the VM.
- */
-
- public void testN7() {
- T_int_to_byte_5 t = new T_int_to_byte_5();
- try {
- t.run(1.333f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = 127
- */
- public void testB1() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(127, t.run(127));
- }
-
- /**
- * @title Argument = 128
- */
- public void testB2() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(-128, t.run(128));
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Argument = -128
- */
- public void testB4() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(-128, t.run(-128));
- }
-
- /**
- * @title Argument = -129
- */
- public void testB5() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(127, t.run(-129));
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB6() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(-1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB7() {
- T_int_to_byte_1 t = new T_int_to_byte_1();
- assertEquals(0, t.run(Integer.MIN_VALUE));
- }
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.d
deleted file mode 100644
index bfbd201..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_byte_1.java
-.class public dot.junit.opcodes.int_to_byte.d.T_int_to_byte_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)B
-.limit regs 5
-
- int-to-byte v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.java
deleted file mode 100644
index 1397f49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_byte.d;
-
-public class T_int_to_byte_1 {
-
- public byte run(int a) {
- return (byte) a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_2.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_2.d
deleted file mode 100644
index 6d18c51..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_byte_2.java
-.class public dot.junit.opcodes.int_to_byte.d.T_int_to_byte_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)B
-.limit regs 5
-
- const-wide v0, 3.14
- int-to-byte v2, v0
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_3.d
deleted file mode 100644
index 6136a49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_byte_3.java
-.class public dot.junit.opcodes.int_to_byte.d.T_int_to_byte_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)B
-.limit regs 5
-
- const-wide v0, 1234
- int-to-byte v2, v0
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_4.d
deleted file mode 100644
index 5049465..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_byte_4.java
-.class public dot.junit.opcodes.int_to_byte.d.T_int_to_byte_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)B
-.limit regs 5
-
- int-to-byte v2, v3
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.d
deleted file mode 100644
index 78fa37c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_byte_5.java
-.class public dot.junit.opcodes.int_to_byte.d.T_int_to_byte_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)B
-.limit regs 5
-
- int-to-byte v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.java
deleted file mode 100644
index 7580b7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_byte.d;
-
-public class T_int_to_byte_5 {
-
- public byte run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_6.d
deleted file mode 100644
index 66b3071..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_byte_6.java
-.class public dot.junit.opcodes.int_to_byte.d.T_int_to_byte_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)B
-.limit regs 5
-
- int-to-byte v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java
deleted file mode 100644
index b426473..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.int_to_char.d.T_int_to_char_1;
-import dot.junit.opcodes.int_to_char.d.T_int_to_char_5;
-
-
-public class Test_int_to_char extends DxTestCase {
- /**
- * @title Argument = 65
- */
- public void testN1() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('A', t.run(65));
- }
-
- /**
- * @title Argument = 65537
- */
- public void testN2() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\u0001', t.run(65537));
- }
-
- /**
- * @title Argument = -2
- */
- public void testN3() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\ufffe', t.run(-2));
- }
-
- /**
- * @title Argument = 0x110000
- */
- public void testN4() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\u0000', t.run(0x110000));
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of float to char makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_int_to_char_5 t = new T_int_to_char_5();
- try {
- t.run(1.333f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = 0
- */
- public void testB1() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\u0000', t.run(0));
- }
-
- /**
- * @title Argument = 65535
- */
- public void testB2() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\uffff', t.run(65535));
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB3() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\uffff', t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB4() {
- T_int_to_char_1 t = new T_int_to_char_1();
- assertEquals('\u0000', t.run(Integer.MIN_VALUE));
- }
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.d
deleted file mode 100644
index c469970..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_char_1.java
-.class public dot.junit.opcodes.int_to_char.d.T_int_to_char_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)C
-.limit regs 5
-
- int-to-char v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.java
deleted file mode 100644
index 42ad201..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_char.d;
-
-public class T_int_to_char_1 {
-
- public char run(int a) {
- return (char) a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_2.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_2.d
deleted file mode 100644
index df98cf1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_char_2.java
-.class public dot.junit.opcodes.int_to_char.d.T_int_to_char_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)C
-.limit regs 5
-
- const-wide v0, 3.14
- int-to-char v2, v0
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_3.d
deleted file mode 100644
index e67ac88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_char_3.java
-.class public dot.junit.opcodes.int_to_char.d.T_int_to_char_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)C
-.limit regs 5
-
- const-wide v0, 1234
- int-to-char v2, v0
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_4.d
deleted file mode 100644
index 72477b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_char_4.java
-.class public dot.junit.opcodes.int_to_char.d.T_int_to_char_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)C
-.limit regs 5
-
- int-to-char v2, v3
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.d
deleted file mode 100644
index c00482b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_char_5.java
-.class public dot.junit.opcodes.int_to_char.d.T_int_to_char_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)C
-.limit regs 5
-
- int-to-char v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.java
deleted file mode 100644
index 7ebbc1a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_char.d;
-
-public class T_int_to_char_5 {
-
- public char run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_6.d
deleted file mode 100644
index 91c0397..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_char_6.java
-.class public dot.junit.opcodes.int_to_char.d.T_int_to_char_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)C
-.limit regs 5
-
- int-to-char v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java
deleted file mode 100644
index ae32560..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.int_to_double.d.T_int_to_double_1;
-import dot.junit.opcodes.int_to_double.d.T_int_to_double_6;
-
-
-public class Test_int_to_double extends DxTestCase {
- /**
- * @title Argument = 300000000
- */
- public void testN1() {
- T_int_to_double_1 t = new T_int_to_double_1();
- assertEquals(300000000d, t.run(300000000), 0d);
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_int_to_double_1 t = new T_int_to_double_1();
- assertEquals(1d, t.run(1), 0d);
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_int_to_double_1 t = new T_int_to_double_1();
- assertEquals(-1d, t.run(-1), 0d);
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of float to double makes no sense but shall not crash the VM.
- */
-
- public void testN8() {
- T_int_to_double_6 t = new T_int_to_double_6();
- try {
- t.run(1.333f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB1() {
- T_int_to_double_1 t = new T_int_to_double_1();
- assertEquals(2147483647d, t.run(Integer.MAX_VALUE), 0d);
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB2() {
- T_int_to_double_1 t = new T_int_to_double_1();
- assertEquals(-2147483648d, t.run(Integer.MIN_VALUE), 0d);
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_int_to_double_1 t = new T_int_to_double_1();
- assertEquals(0d, t.run(0), 0d);
- }
-
-
- /**
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.d
deleted file mode 100644
index 19a17f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_double_1.java
-.class public dot.junit.opcodes.int_to_double.d.T_int_to_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)D
-.limit regs 6
-
- int-to-double v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.java
deleted file mode 100644
index 5277313..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_double.d;
-
-public class T_int_to_double_1 {
-
- public double run(int a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_3.d
deleted file mode 100644
index adc6bfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_double_3.java
-.class public dot.junit.opcodes.int_to_double.d.T_int_to_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)D
-.limit regs 6
-
- const-wide v4, 123455
-
- int-to-double v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_4.d
deleted file mode 100644
index 51f6966..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_double_4.java
-.class public dot.junit.opcodes.int_to_double.d.T_int_to_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()D
-.limit regs 1
-
- const v0, 1234
- int-to-double v0, v0
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_5.d
deleted file mode 100644
index 9d8382d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_double_5.java
-.class public dot.junit.opcodes.int_to_double.d.T_int_to_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)D
-.limit regs 6
-
- int-to-double v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.d
deleted file mode 100644
index 529f23e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_double_6.java
-.class public dot.junit.opcodes.int_to_double.d.T_int_to_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 6
-
- int-to-double v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.java
deleted file mode 100644
index 213dc7a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_double.d;
-
-public class T_int_to_double_6 {
-
- public double run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_7.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_7.d
deleted file mode 100644
index 06b12b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_double_7.java
-.class public dot.junit.opcodes.int_to_double.d.T_int_to_double_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)D
-.limit regs 6
-
- int-to-double v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java
deleted file mode 100644
index 8b6e978..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.int_to_float.d.T_int_to_float_1;
-import dot.junit.opcodes.int_to_float.d.T_int_to_float_5;
-
-public class Test_int_to_float extends DxTestCase {
- /**
- * @title Argument = 123456
- */
- public void testN1() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(123456f, t.run(123456), 0f);
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(1f, t.run(1), 0f);
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(-1f, t.run(-1), 0f);
- }
-
- /**
- * @title Argument = 33564439
- */
- public void testN4() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(3.356444E7f, t.run(33564439), 0f);
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of float to float makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_int_to_float_5 t = new T_int_to_float_5();
- try {
- t.run(1.333f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Argument = 0
- */
- public void testB1() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(0f, t.run(0), 0f);
- }
-
- /**
- * @title Argument = Argument = Integer.MAX_VALUE
- */
- public void testB2() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(2147483650f, t.run(Integer.MAX_VALUE), 0f);
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB3() {
- T_int_to_float_1 t = new T_int_to_float_1();
- assertEquals(-2147483650f, t.run(Integer.MIN_VALUE), 0f);
- }
-
-
- /**
- * @constraint B1
- * @title (type of argument - double)
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.d
deleted file mode 100644
index 16b6f1a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_float_1.java
-.class public dot.junit.opcodes.int_to_float.d.T_int_to_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)F
-.limit regs 5
-
- int-to-float v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.java
deleted file mode 100644
index 777d81e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_float.d;
-
-public class T_int_to_float_1 {
-
- public float run(int a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_2.d
deleted file mode 100644
index c2fdf91..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_float_2.java
-.class public dot.junit.opcodes.int_to_float.d.T_int_to_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)F
-.limit regs 5
-
- const-wide v0, 3.14
- int-to-float v2, v0
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_3.d
deleted file mode 100644
index 4f16417..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_float_3.java
-.class public dot.junit.opcodes.int_to_float.d.T_int_to_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)F
-.limit regs 5
-
- const-wide v0, 1234
- int-to-float v2, v0
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_4.d
deleted file mode 100644
index e31d685..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_float_4.java
-.class public dot.junit.opcodes.int_to_float.d.T_int_to_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)F
-.limit regs 5
-
- int-to-float v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.d
deleted file mode 100644
index c5bd602..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_float_5.java
-.class public dot.junit.opcodes.int_to_float.d.T_int_to_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)F
-.limit regs 5
-
- int-to-float v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.java
deleted file mode 100644
index 3324016..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_float.d;
-
-public class T_int_to_float_5 {
-
- public float run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_6.d
deleted file mode 100644
index 37db947..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_float_6.java
-.class public dot.junit.opcodes.int_to_float.d.T_int_to_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)F
-.limit regs 5
-
- int-to-float v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java
deleted file mode 100644
index 3147723..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.int_to_long.d.T_int_to_long_1;
-import dot.junit.opcodes.int_to_long.d.T_int_to_long_6;
-
-public class Test_int_to_long extends DxTestCase {
- /**
- * @title Argument = 123456
- */
- public void testN1() {
- T_int_to_long_1 t = new T_int_to_long_1();
- assertEquals(123456l, t.run(123456));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_int_to_long_1 t = new T_int_to_long_1();
- assertEquals(1l, t.run(1));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_int_to_long_1 t = new T_int_to_long_1();
- assertEquals(-1l, t.run(-1));
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of float to long makes no sense but shall not crash the VM.
- */
-
- public void testN8() {
- T_int_to_long_6 t = new T_int_to_long_6();
- try {
- t.run(1.333f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = 0
- */
- public void testB1() {
- T_int_to_long_1 t = new T_int_to_long_1();
- assertEquals(0l, t.run(0));
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB2() {
- T_int_to_long_1 t = new T_int_to_long_1();
- assertEquals(2147483647l, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB3() {
- T_int_to_long_1 t = new T_int_to_long_1();
- assertEquals(-2147483648l, t.run(Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.d
deleted file mode 100644
index 4f91de2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_1.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 6
-
- int-to-long v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.java
deleted file mode 100644
index 03becc7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_long.d;
-
-public class T_int_to_long_1 {
-
- public long run(int a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_2.d
deleted file mode 100644
index eab475b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_2.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 6
-
- const-wide v4, 3.1415
-
- int-to-long v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_3.d
deleted file mode 100644
index 05527d4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_3.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 6
-
- const-wide v4, 123455
-
- int-to-long v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_4.d
deleted file mode 100644
index 9f26670..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_4.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 1
-
- const v0, 1234
- int-to-long v0, v0
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_5.d
deleted file mode 100644
index f006048..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_5.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 6
-
- int-to-long v0, v4
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.d
deleted file mode 100644
index f71a28d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_6.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 6
-
- int-to-long v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.java
deleted file mode 100644
index da307c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_long.d;
-
-public class T_int_to_long_6 {
-
- public long run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_7.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_7.d
deleted file mode 100644
index c2db686..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_long_7.java
-.class public dot.junit.opcodes.int_to_long.d.T_int_to_long_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 6
-
- int-to-long v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java
deleted file mode 100644
index 7e4c6a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.int_to_short.d.T_int_to_short_1;
-import dot.junit.opcodes.int_to_short.d.T_int_to_short_5;
-
-public class Test_int_to_short extends DxTestCase {
- /**
- * @title Argument = 1
- */
- public void testN1() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN2() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(-1, t.run(-1));
- }
-
- /**
- * @title Argument = 32767
- */
- public void testN3() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(32767, t.run(32767));
- }
-
- /**
- * @title Argument = -32768
- */
- public void testN4() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(-32768, t.run(-32768));
- }
-
- /**
- * @title Argument = -32769
- */
- public void testN5() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(32767, t.run(-32769));
- }
-
- /**
- * @title Argument = 32768
- */
- public void testN6() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(-32768, t.run(32768));
- }
-
- /**
- * @title Argument = 0x10fedc;
- */
- public void testN7() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(0xfffffedc, t.run(0x10fedc));
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this conversion of float to short makes no sense but shall not crash the VM.
- */
-
- public void testN8() {
- T_int_to_short_5 t = new T_int_to_short_5();
- try {
- t.run(1.333f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = 0
- */
- public void testB1() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB2() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(-1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB3() {
- T_int_to_short_1 t = new T_int_to_short_1();
- assertEquals(0, t.run(Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.d
deleted file mode 100644
index fcf1727..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_short_1.java
-.class public dot.junit.opcodes.int_to_short.d.T_int_to_short_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)S
-.limit regs 5
-
- int-to-short v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.java
deleted file mode 100644
index 2188088..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_short.d;
-
-public class T_int_to_short_1 {
-
- public short run(int a) {
- return (short)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_2.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_2.d
deleted file mode 100644
index 9c1154b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_short_2.java
-.class public dot.junit.opcodes.int_to_short.d.T_int_to_short_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)S
-.limit regs 5
-
- const-wide v0, 3.14
- int-to-short v2, v0
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_3.d
deleted file mode 100644
index 5f83549..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_short_3.java
-.class public dot.junit.opcodes.int_to_short.d.T_int_to_short_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)S
-.limit regs 5
-
- const-wide v0, 1234
- int-to-short v2, v0
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_4.d
deleted file mode 100644
index 147fb66..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_short_4.java
-.class public dot.junit.opcodes.int_to_short.d.T_int_to_short_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)S
-.limit regs 5
-
- int-to-short v2, v3
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.d
deleted file mode 100644
index 8ca83e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_short_5.java
-.class public dot.junit.opcodes.int_to_short.d.T_int_to_short_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)S
-.limit regs 5
-
- int-to-short v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.java b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.java
deleted file mode 100644
index 2749fc0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.int_to_short.d;
-
-public class T_int_to_short_5 {
-
- public short run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_6.d
deleted file mode 100644
index 8d6f0ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_int_to_short_6.java
-.class public dot.junit.opcodes.int_to_short.d.T_int_to_short_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)S
-.limit regs 5
-
- int-to-short v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TAbstract.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TAbstract.java
deleted file mode 100644
index f6d0ed0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TAbstract.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct;
-
-public abstract class TAbstract {
- protected abstract int toInt();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TPlain.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TPlain.java
deleted file mode 100644
index a6db3d4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TPlain.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct;
-
-public class TPlain {
- public int toInt() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TSuper.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TSuper.java
deleted file mode 100644
index 03026ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/TSuper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct;
-
-/**
- * @author fjost
- *
- */
-public class TSuper {
- public int val;
-
- public int toInt() {
- return 5;
- }
-
- public int toInt(float v) {
- return (int)v;
- }
-
- public int testArgsOrder(int a, int b) {
- return a/b;
- }
-
- public native int toIntNative();
-
- public static int toIntStatic() {
- return 5;
- }
-
- protected int toIntP() {
- return 5;
- }
-
- private int toIntPvt() {
- return 5;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
deleted file mode 100644
index e7c6a0b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_12;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_13;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_16;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_2;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_21;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_6;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_7;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_8;
-import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_9;
-
-public class Test_invoke_direct extends DxTestCase {
-
- /**
- * @title private method call
- */
- public void testN2() {
- T_invoke_direct_2 t = new T_invoke_direct_2();
- assertEquals(345, t.run());
- }
-
-
- /**
- * @title Check that new frame is created by invoke_direct
- */
- public void testN7() {
- T_invoke_direct_21 t = new T_invoke_direct_21();
- assertEquals(1, t.run());
- }
-
-
-
- /**
- * @title objref is null
- */
- public void testE3() {
- T_invoke_direct_8 t = new T_invoke_direct_8();
- try {
- assertEquals(5, t.run());
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE5() {
- T_invoke_direct_9 t = new T_invoke_direct_9();
- try {
- assertEquals(5, t.run());
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
- }
-
- /**
- * @constraint A13
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title invoke-direct may not be used to invoke <clinit>
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B4
- * @title invoke-direct target must be in self or superclass
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_6
- //@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- new T_invoke_direct_6();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title int is passed instead of obj ref
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B9
- * @title number of arguments passed to method
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing protected method
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25
- //@uses dot.junit.opcodes.invoke_direct.TPlain
- //@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B5
- * @title Superclass' method call
- */
- public void testVFE11() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25
- //@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to call undefined method.
- */
- public void testVFE13() {
- try {
- new T_invoke_direct_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE14() {
- try {
- new T_invoke_direct_16().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to invoke static method. Java throws IncompatibleClassChangeError
- * on first access but Dalvik throws VerifyError on class loading.
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke private method of superclass.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_12
- //@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- new T_invoke_direct_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke abstract method
- */
- public void testVFE17() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_13
- //@uses dot.junit.opcodes.invoke_direct.TAbstract
- try {
- new T_invoke_direct_13().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B5
- * @title An instance initializer must only be invoked on an uninitialized instance.
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B8
- * @title attempt to access inherited instance field before <init> is called
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18
- //@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A13
- * @title attempt to invoke interface method
- */
- public void testVFE20() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE21() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_27");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.d
deleted file mode 100644
index 65a8a32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_1.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_1
-.super dot/junit/opcodes/invoke_direct/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/TSuper/toInt()I
- move-result v1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.java
deleted file mode 100644
index b692683..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-import dot.junit.opcodes.invoke_direct.TSuper;
-
-public class T_invoke_direct_1 extends TSuper {
-
- public int run() {
- return super.toInt();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10.d
deleted file mode 100644
index 08b22c9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_10.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v0, 1222
- invoke-direct {v0}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_11.d
deleted file mode 100644
index 6566718..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_11.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_11.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v2}, dot.junit.opcodes.invoke_direct.d.T_invoke_direct_11/toInt()I
- move-result v0
- return v0
-.end method
-
-
-.method private static toInt()I
-.limit regs 1
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d
deleted file mode 100644
index 6230fa9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_12.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_12
-.super dot/junit/opcodes/invoke_direct/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/toIntPvt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.java
deleted file mode 100644
index 2911abf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-
-public class T_invoke_direct_12 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.d
deleted file mode 100644
index 23d4378..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_13.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_13
-.super dot/junit/opcodes/invoke_direct/TAbstract
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TAbstract/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/TAbstract/toInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.java
deleted file mode 100644
index df8d0d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-
-public class T_invoke_direct_13 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14.d
deleted file mode 100644
index 4d10ce8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_14.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test(II)I
-.limit regs 7
- const v0, 999
- const v1, 888
- const v2, 777
-
- div-int v4, v5, v6
-
- return v4
-.end method
-
-.method public run()I
-.limit regs 7
- const v0, 111
- const v1, 222
- const v2, 333
-
- const v3, 50
- const v4, 25
-
- invoke-direct {v6, v3}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14/test(II)I
- move-result v3
-
- const v4, 2
- if-ne v3, v4, Label30
-
- const v4, 111
- if-ne v0, v4, Label30
-
- const v4, 222
- if-ne v1, v4, Label30
-
- const v4, 333
- if-ne v2, v4, Label30
-
- const v0, 1
- return v0
-Label30:
- const v0, 0
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15.d
deleted file mode 100644
index 55b7d3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_15.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v3}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.d
deleted file mode 100644
index 10e041d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_16.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16/toInt()F
-
- const/4 v1, 0
- return v1
-.end method
-
-
-.method private toInt()I
-.limit regs 1
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.java
deleted file mode 100644
index cae7ae8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-
-public class T_invoke_direct_16 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_17.d
deleted file mode 100644
index 35a54d9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_17.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- new-instance v0, java/lang/String
- invoke-direct {v0} java/lang/String/<init>()V
- invoke-direct {v0} java/lang/String/<init>()V
- return-void
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_18.d
deleted file mode 100644
index 602cbeb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_18.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_18.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18
-.super dot/junit/opcodes/invoke_direct/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- const v0, 0
- iput v0, v1, dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18.val I
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.d
deleted file mode 100644
index 0c11388..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_2.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.java
deleted file mode 100644
index ab6e1ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-public class T_invoke_direct_2 {
-
- public int run() {
- return getInt();
- }
-
- private int getInt() {
- return 345;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.d
deleted file mode 100644
index d6653fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_21.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test(II)I
-.limit regs 7
- const v0, 999
- const v1, 888
- const v2, 777
-
- div-int v4, v5, v6
-
- return v4
-.end method
-
-.method public run()I
-.limit regs 7
- const v0, 111
- const v1, 222
- const v2, 333
-
- const v3, 50
- const v4, 25
-
- invoke-direct {v6, v3, v4}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21/test(II)I
- move-result v3
-
- const v4, 2
- if-ne v3, v4, Label30
-
- const v4, 111
- if-ne v0, v4, Label30
-
- const v4, 222
- if-ne v1, v4, Label30
-
- const v4, 333
- if-ne v2, v4, Label30
-
- const v0, 1
- return v0
-Label30:
- const v0, 0
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.java
deleted file mode 100644
index cec52ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-public class T_invoke_direct_21 {
-
-
- private int test(int a, int b) {
- int i = 999;
- int j = 888;
- int k = 777;
- return a / b;
- }
-
- public int run() {
- int i = 111;
- int j = 222;
- int k = 333;
- test(50, 25);
-
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24.d
deleted file mode 100644
index 83fd3db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_24.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_24
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test(II)I
-.limit regs 7
- const v0, 999
- const v1, 888
- const v2, 777
-
- div-int v4, v5, v6
-
- return v4
-.end method
-
-.method public run()I
-.limit regs 7
- const v0, 111
- const v1, 222
- const v2, 333
-
-
- const-wide v3, 50
-
- invoke-direct {v6, v3, v4}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24/test(II)I
- move-result v3
-
- const v4, 2
- if-ne v3, v4, Label30
-
- const v4, 111
- if-ne v0, v4, Label30
-
- const v4, 222
- if-ne v1, v4, Label30
-
- const v4, 333
- if-ne v2, v4, Label30
-
- const v0, 1
- return v0
-Label30:
- const v0, 0
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_25.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_25.d
deleted file mode 100644
index 8d872ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_25.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_25.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25
-.super dot/junit/opcodes/invoke_direct/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/<init>()V
- return-void
-.end method
-
-.method private test()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_direct/TPlain
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/TPlain/<init>()V
-
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_25/test()V
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_26.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_26.d
deleted file mode 100644
index 40cce50..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_26.d
+++ /dev/null
@@ -1,58 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_direct.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-; =====================================
-
-.source TTestInterfaceImpl.java
-.class public dot.junit.opcodes.invoke_direct.d.TTestInterfaceImpl
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_direct.d.TTestInterface
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-; =====================================
-
-.source T_invoke_direct_26.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26
-.super dot/junit/opcodes/invoke_direct/d/TTestInterfaceImpl
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/d/TTestInterfaceImpl/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-direct {v7}, dot/junit/opcodes/invoke_direct/d/TTestInterface/test()V
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_27.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_27.d
deleted file mode 100644
index 0ac6b37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_27.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_27.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_27
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 3
-
- new-instance v0, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_27
-
- invoke-direct {v0}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_27/test()V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.d
deleted file mode 100644
index 6aa7821..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_3.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.dfh
deleted file mode 100644
index 993ee4e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.dfh
+++ /dev/null
@@ -1,285 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : b8124ca4
- A4 4C 12 B8
-// parsed: offset 12, len 20: signature : 70e1...b983
- 70 E1 1F B5 6C 1D F3 77 2E 7D E3 42 02 A1 DA DC 85 4D B9 83
-// parsed: offset 32, len 4: file_size : 592
- 50 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 468 (0x0001d4)
- D4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 344
- 58 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 324 (0x000144) "<init>"
- 44 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 332 (0x00014c) "I"
- 4C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 335 (0x00014f) "Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;"
- 4F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 390 (0x000186) "Ljava/lang/Object;"
- 86 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 410 (0x00019a) "T_invoke_direct_3.java"
- 9A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 434 (0x0001b2) "V"
- B2 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 437 (0x0001b5) "getInt"
- B5 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 445 (0x0001bd) "run"
- BD 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "getInt"
- 01 00 00 00 06 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [3] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_invoke_direct_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 450 (0x0001c2)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 C2 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3.<init>"
- // parsed: offset 248, len 2: registers_size: 2
- 02 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0003
- 70 10 03 00 01 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3.getInt"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: const/16 v1, #int 345 // #0x159
- 13 01 59 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// CODE_ITEM for "dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3.run"
- // parsed: offset 296, len 2: registers_size: 3
- 03 00
- // parsed: offset 298, len 2: ins_size: 1
- 01 00
- // parsed: offset 300, len 2: outs_size: 1
- 01 00
- // parsed: offset 302, len 2: tries_size: 0
- 00 00
- // parsed: offset 304, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 308, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 312, len 6: |0000: invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;.getInt:()I // method@0001
-//@mod 70 10 01 00 02 00
- 70 10 01 01 02 00
- // parsed: offset 318, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 320, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 322, len 2: PADDING
- 00 00
-// parsed: offset 324, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 332, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 335, len 55: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 64 69 72 65 63 74 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 64 69 72 65 63 74 5F 33 3B 00
-// parsed: offset 390, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 410, len 24: TYPE_STRING_DATA_ITEM [4] "T_invoke_direct_3.java"
- 16 54 5F 69 6E 76 6F 6B 65 5F 64 69 72 65 63 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 434, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 437, len 8: TYPE_STRING_DATA_ITEM [6] "getInt"
- 06 67 65 74 49 6E 74 00
-// parsed: offset 445, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;"
- // parsed: offset 450, len 1: static_fields_size: 0
- 00
- // parsed: offset 451, len 1: instance_fields_size: 0
- 00
- // parsed: offset 452, len 1: direct_methods_size: 2
- 02
- // parsed: offset 453, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 454, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 455, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 458, len 2: code_off: 248 (0x0000f8)
- F8 01
- // method [1]:
- // parsed: offset 460, len 1: method_idx_diff: 1 (method_idx: 1 "getInt")
- 01
- // parsed: offset 461, len 1: access_flags: 0x000002 (PRIVATE)
- 02
- // parsed: offset 462, len 2: code_off: 272 (0x000110)
- 90 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 464, len 1: method_idx_diff: 2 (method_idx: 2 "run")
- 02
- // parsed: offset 465, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 466, len 2: code_off: 296 (0x000128)
- A8 02
-// map_list:
- // parsed: offset 468, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 472, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 484, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 496, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 508, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 520, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 184 (0x0000b8)
- 05 00 00 00 04 00 00 00 B8 00 00 00
- // parsed: offset 532, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 544, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 3
- // offset: 248 (0x0000f8)
- 01 20 00 00 03 00 00 00 F8 00 00 00
- // parsed: offset 556, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 324 (0x000144)
- 02 20 00 00 08 00 00 00 44 01 00 00
- // parsed: offset 568, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 450 (0x0001c2)
- 00 20 00 00 01 00 00 00 C2 01 00 00
- // parsed: offset 580, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 10 00 00 01 00 00 00 D4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d
deleted file mode 100644
index e6e7511..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_4.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_4
-.super java/lang/Object
-
-.method static <clinit>()V
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
- invoke-direct {v0}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4/<clinit>()V
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5.d
deleted file mode 100644
index c4dac34..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_5.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.d
deleted file mode 100644
index 6bb8833..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.d
+++ /dev/null
@@ -1,27 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_6.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/toIntPvt()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.java
deleted file mode 100644
index 6f95a12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-public class T_invoke_direct_6 {
- public T_invoke_direct_6() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.d
deleted file mode 100644
index 2c1b99b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_7.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7/toInt()I
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.java
deleted file mode 100644
index b640fa3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-
-public class T_invoke_direct_7 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.d
deleted file mode 100644
index 99b510b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_8.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/4 v1, 0
- invoke-direct {v1}, dot.junit.opcodes.invoke_direct.d.T_invoke_direct_8/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method private toInt()I
-.limit regs 1
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.java
deleted file mode 100644
index 8c9825d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-public class T_invoke_direct_8 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_9.d
deleted file mode 100644
index 262b5ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_9.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_9.java
-.class public dot.junit.opcodes.invoke_direct.d.T_invoke_direct_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct {v2}, dot.junit.opcodes.invoke_direct.d.T_invoke_direct_9/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method private native toInt()I
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_9.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_9.java
deleted file mode 100644
index c0913ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct.d;
-
-public class T_invoke_direct_9 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TAbstract.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TAbstract.java
deleted file mode 100644
index 8c5ab27..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TAbstract.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range;
-
-public abstract class TAbstract {
- protected abstract int toInt();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TPlain.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TPlain.java
deleted file mode 100644
index 3e4aab1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TPlain.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range;
-
-public class TPlain {
- public int toInt() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TSuper.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TSuper.java
deleted file mode 100644
index c8cbc0a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/TSuper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dot.junit.opcodes.invoke_direct_range;
-
-/**
- * @author fjost
- *
- */
-public class TSuper {
- public int val;
- public int toInt() {
- return 5;
- }
-
- public int toInt(float v) {
- return (int)v;
- }
-
- public int testArgsOrder(int a, int b) {
- return a/b;
- }
-
- public native int toIntNative();
-
- public static int toIntStatic() {
- return 5;
- }
-
- protected int toIntP() {
- return 5;
- }
-
- private int toIntPvt() {
- return 5;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
deleted file mode 100644
index 1682c68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_12;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_13;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_16;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_2;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_21;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_6;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_7;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_8;
-import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_9;
-
-public class Test_invoke_direct_range extends DxTestCase {
-
- /**
- * @title private method call
- */
- public void testN2() {
- T_invoke_direct_range_2 t = new T_invoke_direct_range_2();
- assertEquals(345, t.run());
- }
-
-
- /**
- * @title Check that new frame is created by invoke_direct_range
- */
- public void testN7() {
- T_invoke_direct_range_21 t = new T_invoke_direct_range_21();
- assertEquals(1, t.run());
- }
-
-
-
- /**
- * @title objref is null
- */
- public void testE3() {
- T_invoke_direct_range_8 t = new T_invoke_direct_range_8();
- try {
- assertEquals(5, t.run());
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE5() {
- T_invoke_direct_range_9 t = new T_invoke_direct_range_9();
- try {
- assertEquals(5, t.run());
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
- }
-
- /**
- * @constraint A14
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title invoke-direct may not be used to invoke <clinit>
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B4
- * @title invoke-direct target must be in self or superclass
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_6
- //@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- new T_invoke_direct_range_6();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title int is passed instead of obj ref
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B9
- * @title number of arguments passed to method
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing protected method
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25
- //@uses dot.junit.opcodes.invoke_direct_range.TPlain
- //@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B5
- * @title Superclass' method call
- */
- public void testVFE11() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25
- //@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to call undefined method.
- */
- public void testVFE13() {
- try {
- new T_invoke_direct_range_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE14() {
- try {
- new T_invoke_direct_range_16().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to invoke static method. Java throws IncompatibleClassChangeError
- * on first access but Dalvik throws VerifyError on class loading.
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke private method of superclass. Java throws IllegalAccessError
- * on first access but Dalvik throws VerifyError on class loading.
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_12
- //@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- new T_invoke_direct_range_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke abstract method
- */
- public void testVFE17() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_13
- //@uses dot.junit.opcodes.invoke_direct_range.TAbstract
- try {
- new T_invoke_direct_range_13().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B5
- * @title An instance initializer must only be invoked on an uninitialized instance.
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B8
- * @title attempt to access inherited instance field before <init> is called
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18
- //@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A14
- * @title attempt to invoke interface method
- */
- public void testVFE20() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE21() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_27");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.d
deleted file mode 100644
index 7123eb9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_1.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_1
-.super dot/junit/opcodes/invoke_direct_range/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/TSuper/toInt()I
- move-result v1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.java
deleted file mode 100644
index 243b923..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-import dot.junit.opcodes.invoke_direct_range.TSuper;
-
-public class T_invoke_direct_range_1 extends TSuper {
-
- public int run() {
- return super.toInt();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10.d
deleted file mode 100644
index 2dcf576..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_10.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v0, 1222
- invoke-direct/range {v0}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11.d
deleted file mode 100644
index 772fc10..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_11.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v2}, dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_11/toInt()I
- move-result v0
- return v0
-.end method
-
-
-.method private static toInt()I
-.limit regs 1
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d
deleted file mode 100644
index a107ac3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_12.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_12
-.super dot/junit/opcodes/invoke_direct_range/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/toIntPvt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.java
deleted file mode 100644
index e01b4f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_12 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.d
deleted file mode 100644
index 830c367..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_13.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_13
-.super dot/junit/opcodes/invoke_direct_range/TAbstract
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/TAbstract/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
- invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/TAbstract/toInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.java
deleted file mode 100644
index 39c9977..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_13 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14.d
deleted file mode 100644
index a59d5ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_14.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test(II)I
-.limit regs 7
- const v0, 999
- const v1, 888
- const v2, 777
-
- div-int v4, v5, v6
-
- return v4
-.end method
-
-.method public run()I
-.limit regs 7
- const v0, 111
- const v1, 222
- const v2, 333
-
- const v4, 50
- const v5, 25
- move-object v3, v6
- invoke-direct/range {v3..v4}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14/test(II)I
- move-result v3
-
- const v4, 2
- if-ne v3, v4, Label30
-
- const v4, 111
- if-ne v0, v4, Label30
-
- const v4, 222
- if-ne v1, v4, Label30
-
- const v4, 333
- if-ne v2, v4, Label30
-
- const v0, 1
- return v0
-Label30:
- const v0, 0
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15.d
deleted file mode 100644
index 343eafd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_15.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v3}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.d
deleted file mode 100644
index 82b85d8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_16.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16/toInt()F
-
- const/4 v1, 0
- return v1
-.end method
-
-
-.method private toInt()I
-.limit regs 1
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.java
deleted file mode 100644
index c593d95..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_16 {
- public int run() {
- return 0;
- }
-
- private int toInt() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17.d
deleted file mode 100644
index add1dc9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_17.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- new-instance v0, java/lang/String
- invoke-direct/range {v0} java/lang/String/<init>()V
- invoke-direct/range {v0} java/lang/String/<init>()V
- return-void
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18.d
deleted file mode 100644
index 3922d1b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_18.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18
-.super dot/junit/opcodes/invoke_direct_range/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- const v0, 0
- iput v0, v1, dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18.val I
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.d
deleted file mode 100644
index 3d4e23c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_2.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.java
deleted file mode 100644
index 09fa293..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_2 {
-
- public int run() {
- return getInt();
- }
-
- private int getInt() {
- return 345;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.d
deleted file mode 100644
index 234de66..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_21.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct/range {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test(II)I
-.limit regs 7
- const v0, 999
- const v1, 888
- const v2, 777
-
- div-int v4, v5, v6
-
- return v4
-.end method
-
-.method public run()I
-.limit regs 7
- const v0, 111
- const v1, 222
- const v2, 333
-
- const v4, 50
- const v5, 25
- move-object v3, v6
- invoke-direct/range {v3..v5}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21/test(II)I
- move-result v3
-
- const v4, 2
- if-ne v3, v4, Label30
-
- const v4, 111
- if-ne v0, v4, Label30
-
- const v4, 222
- if-ne v1, v4, Label30
-
- const v4, 333
- if-ne v2, v4, Label30
-
- const v0, 1
- return v0
-Label30:
- const v0, 0
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.java
deleted file mode 100644
index 537d238..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_21 {
-
-
- private int test(int a, int b) {
- int i = 999;
- int j = 888;
- int k = 777;
- return a / b;
- }
-
- public int run() {
- int i = 111;
- int j = 222;
- int k = 333;
- test(50, 25);
-
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_24.d
deleted file mode 100644
index 31a24c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_24.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_24.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_24
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test(II)I
-.limit regs 7
- const v0, 999
- const v1, 888
- const v2, 777
-
- div-int v4, v5, v6
-
- return v4
-.end method
-
-.method public run()I
-.limit regs 7
- const v0, 111
- const v1, 222
- const v2, 333
-
-
- const-wide v4, 50
- move-object v3, v6
- invoke-direct {v3..v5}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_24/test(II)I
- move-result v3
-
- const v4, 2
- if-ne v3, v4, Label30
-
- const v4, 111
- if-ne v0, v4, Label30
-
- const v4, 222
- if-ne v1, v4, Label30
-
- const v4, 333
- if-ne v2, v4, Label30
-
- const v0, 1
- return v0
-Label30:
- const v0, 0
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_25.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_25.d
deleted file mode 100644
index 6c2334e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_25.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_25.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25
-.super dot/junit/opcodes/invoke_direct_range/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/<init>()V
- return-void
-.end method
-
-.method private test()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_direct_range/TPlain
- invoke-direct {v2}, dot/junit/opcodes/invoke_direct_range/TPlain/<init>()V
-
- invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_25/test()V
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_26.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_26.d
deleted file mode 100644
index 6160fe5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_26.d
+++ /dev/null
@@ -1,58 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_direct_range.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-; =====================================
-
-.source TTestInterfaceImpl.java
-.class public dot.junit.opcodes.invoke_direct_range.d.TTestInterfaceImpl
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_direct_range.d.TTestInterface
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-; =====================================
-
-.source T_invoke_direct_range_26.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26
-.super dot/junit/opcodes/invoke_direct_range/d/TTestInterfaceImpl
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct_range/d/TTestInterfaceImpl/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-direct/range {v7}, dot/junit/opcodes/invoke_direct_range/d/TTestInterface/test()V
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_27.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_27.d
deleted file mode 100644
index 1073241..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_27.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_27.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_27
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 3
-
- new-instance v0, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_27
-
- invoke-direct/range {v0}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_27/test()V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.d
deleted file mode 100644
index 056f2c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_3.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.dfh
deleted file mode 100644
index 9772f88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.dfh
+++ /dev/null
@@ -1,287 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c60753cb
- CB 53 07 C6
-// parsed: offset 12, len 20: signature : 556e...6eba
- 55 6E A2 8D 60 66 C0 56 70 4C 6B 33 11 26 64 F4 F4 94 6E BA
-// parsed: offset 32, len 4: file_size : 612
- 64 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 488 (0x0001e8)
- E8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 364
- 6C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 324 (0x000144) "<init>"
- 44 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 332 (0x00014c) "I"
- 4C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 335 (0x00014f) "Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;"
- 4F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 402 (0x000192) "Ljava/lang/Object;"
- 92 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 422 (0x0001a6) "T_invoke_direct_range_3.java"
- A6 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 452 (0x0001c4) "V"
- C4 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 455 (0x0001c7) "getInt"
- C7 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 463 (0x0001cf) "run"
- CF 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "getInt"
- 01 00 00 00 06 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [3] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_invoke_direct_range_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 468 (0x0001d4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 D4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3.<init>"
- // parsed: offset 248, len 2: registers_size: 2
- 02 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0003
- 70 10 03 00 01 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3.getInt"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: const/16 v1, #int 345 // #0x159
- 13 01 59 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// CODE_ITEM for "dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3.run"
- // parsed: offset 296, len 2: registers_size: 3
- 03 00
- // parsed: offset 298, len 2: ins_size: 1
- 01 00
- // parsed: offset 300, len 2: outs_size: 1
- 01 00
- // parsed: offset 302, len 2: tries_size: 0
- 00 00
- // parsed: offset 304, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 308, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 312, len 6: |0000: invoke-direct/range {v2..v2}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;.getInt:()I // method@0001
-//@mod 76 01 01 00 02 00
- 76 01 01 01 02 00
- // parsed: offset 318, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 320, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 322, len 2: PADDING
- 00 00
-// parsed: offset 324, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 332, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 335, len 67: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;"
- 41 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 64 69 72 65 63 74 5F 72 61 6E 67 65 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 64 69 72 65 63 74 5F 72 61 6E 67 65 5F 33 3B 00
-// parsed: offset 402, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 422, len 30: TYPE_STRING_DATA_ITEM [4] "T_invoke_direct_range_3.java"
- 1C 54 5F 69 6E 76 6F 6B 65 5F 64 69 72 65 63 74 5F 72 61 6E 67 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 452, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 455, len 8: TYPE_STRING_DATA_ITEM [6] "getInt"
- 06 67 65 74 49 6E 74 00
-// parsed: offset 463, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;"
- // parsed: offset 468, len 1: static_fields_size: 0
- 00
- // parsed: offset 469, len 1: instance_fields_size: 0
- 00
- // parsed: offset 470, len 1: direct_methods_size: 2
- 02
- // parsed: offset 471, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 472, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 473, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 476, len 2: code_off: 248 (0x0000f8)
- F8 01
- // method [1]:
- // parsed: offset 478, len 1: method_idx_diff: 1 (method_idx: 1 "getInt")
- 01
- // parsed: offset 479, len 1: access_flags: 0x000002 (PRIVATE)
- 02
- // parsed: offset 480, len 2: code_off: 272 (0x000110)
- 90 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 482, len 1: method_idx_diff: 2 (method_idx: 2 "run")
- 02
- // parsed: offset 483, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 484, len 2: code_off: 296 (0x000128)
- A8 02
-// parsed: offset 486, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 488, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 492, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 504, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 516, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 528, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 540, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 184 (0x0000b8)
- 05 00 00 00 04 00 00 00 B8 00 00 00
- // parsed: offset 552, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 564, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 3
- // offset: 248 (0x0000f8)
- 01 20 00 00 03 00 00 00 F8 00 00 00
- // parsed: offset 576, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 324 (0x000144)
- 02 20 00 00 08 00 00 00 44 01 00 00
- // parsed: offset 588, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 20 00 00 01 00 00 00 D4 01 00 00
- // parsed: offset 600, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 488 (0x0001e8)
- 00 10 00 00 01 00 00 00 E8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_4.d
deleted file mode 100644
index a7aeae9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_4.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_4
-.super java/lang/Object
-
-.method static <clinit>()V
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
- invoke-direct/range {v0}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_4/<clinit>()V
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5.d
deleted file mode 100644
index 4ec85bb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_5.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
-
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.d
deleted file mode 100644
index cda9caf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.d
+++ /dev/null
@@ -1,27 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_6.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/toIntPvt()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.java
deleted file mode 100644
index b1e3a6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_6 {
- public T_invoke_direct_range_6() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.d
deleted file mode 100644
index f0254f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_7.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7/toInt()I
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.java
deleted file mode 100644
index f68ed92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_7 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.d
deleted file mode 100644
index 946c65f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_8.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/4 v1, 0
- invoke-direct/range {v1}, dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_8/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method private toInt()I
-.limit regs 1
- const v0, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.java
deleted file mode 100644
index bde2e71..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_8 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_9.d
deleted file mode 100644
index 567bd84..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_9.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_direct_range_9.java
-.class public dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-direct/range {v2}, dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_9/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method private native toInt()I
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_9.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_9.java
deleted file mode 100644
index db73113..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_direct_range.d;
-
-public class T_invoke_direct_range_9 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITest.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITest.java
deleted file mode 100644
index 79917a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface;
-
-public interface ITest {
- public void doit();
- public void doit(int i);
- public void doitNative();
- public int test(int a);
- public int testArgsOrder(int a, int b);
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITestImpl.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITestImpl.java
deleted file mode 100644
index cf0c0c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITestImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface;
-
-public class ITestImpl implements ITest {
- public void doit() {
- // impl
- }
-
- public void doit(int i) {
- //
- }
-
- public native void doitNative();
-
- public int test(int a) {
- if (a == 999) return 195;
- return 0;
- }
-
- public int testArgsOrder(int a, int b) {
- return a / b;
- }
-
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITestImplAbstract.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITestImplAbstract.java
deleted file mode 100644
index af7a36029..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/ITestImplAbstract.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface;
-
-
-public abstract class ITestImplAbstract implements ITest {
- abstract public void doit();
- abstract public void doit(int i);
- public native void doitNative();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
deleted file mode 100644
index 377cc58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_1;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_12;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_13;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_14;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_16;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_18;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_20;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_21;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_3;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_4;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_5;
-import dot.junit.opcodes.invoke_interface.d.T_invoke_interface_7;
-
-public class Test_invoke_interface extends DxTestCase {
-
- /**
- * @title invoke interface method
- */
- public void testN1() {
- T_invoke_interface_1 t = new T_invoke_interface_1();
- assertEquals(0, t.run("aa", "aa"));
- assertEquals(-1, t.run("aa", "bb"));
- assertEquals(1, t.run("bb", "aa"));
- }
-
- /**
- * @title Check that new frame is created by invoke_interface and
- * arguments are passed to method
- */
- public void testN2() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_14
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- T_invoke_interface_14 t = new T_invoke_interface_14();
- ITestImpl impl = new ITestImpl();
- assertEquals(1, t.run(impl));
- }
-
-
-
- /**
- * @title objref is null
- */
- public void testE3() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_3
- //@uses dot.junit.opcodes.invoke_interface.ITest
- try {
- new T_invoke_interface_3(null);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title object doesn't implement interface
- */
- public void testE4() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- T_invoke_interface_11 t = new T_invoke_interface_11();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE5() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_12
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- T_invoke_interface_12 t = new T_invoke_interface_12();
- ITestImpl impl = new ITestImpl();
- try {
- t.run(impl);
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
- }
-
- /**
- * @title Attempt to invoke abstract method
- */
- public void testE6() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_13
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- //@uses dot.junit.opcodes.invoke_interface.ITestImplAbstract
- T_invoke_interface_13 t = new T_invoke_interface_13();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError e) {
- // expected
- }
- }
-
- /**
- * @constraint A16
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A16
- * @title The referenced method_id must belong to an interface (not a class).
- */
- public void testVFE2() {
- try {
- new T_invoke_interface_4().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments
- */
- public void testVFE5() {
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_5(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title int is passed instead of objref
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title number of arguments passed to method
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title invoke-interface may not be used to call <init>.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- //@uses dot.junit.opcodes.invoke_interface.ITestImplAbstract
- try {
- new T_invoke_interface_18().run(new ITestImpl());
- fail("expected InstantiationError");
- } catch (InstantiationError t) {
- }
- }
-
- /**
- * @constraint A15
- * @title invoke-interface may not be used to call <clinit>.
- */
- public void testVFE11() {
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_20().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_21().run(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call undefined method.
- */
- public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_7
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_7().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_16
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_16().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE21() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_22
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.d
deleted file mode 100644
index 72c1843..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_1.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface {v6, v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.java
deleted file mode 100644
index 4e0f991..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-public class T_invoke_interface_1 {
-
- public int run(Comparable c, Object o) {
- return c.compareTo(o);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_10.d
deleted file mode 100644
index 65ca5f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_10.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
- const v6, 1243
- invoke-interface {v6, v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.d
deleted file mode 100644
index 110d826..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_11.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- invoke-interface {v4}, dot/junit/opcodes/invoke_interface/ITest/doit()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.java
deleted file mode 100644
index 1bde245..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-
-public class T_invoke_interface_11 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.d
deleted file mode 100644
index c623612..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_12.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 5
-
- invoke-interface {v4}, dot/junit/opcodes/invoke_interface/ITest/doitNative()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.java
deleted file mode 100644
index 344e3d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_12 {
-
- public void run(ITest test) {
- test.doitNative();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.d
deleted file mode 100644
index 8d696af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_13.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_13
-.super dot/junit/opcodes/invoke_interface/ITestImplAbstract
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_interface/ITestImplAbstract/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 7
-
- invoke-interface {v6}, dot/junit/opcodes/invoke_interface/ITest/doit()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.java
deleted file mode 100644
index d0cd67d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-
-public class T_invoke_interface_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.d
deleted file mode 100644
index d6ce02a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.d
+++ /dev/null
@@ -1,54 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_14.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)I
-.limit regs 9
- const v1, 123
- const v2, 345
-
- const v4, 64
- const v5, 2
- invoke-interface {v8, v4, v5}, dot/junit/opcodes/invoke_interface/ITest/testArgsOrder(II)I
- move-result v4
- const v5, 32
- if-ne v4, v5, Label0
-
- const v5, 123
- if-ne v5, v1, Label0
-
- const v5, 345
- if-ne v5, v2, Label0
-
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.java
deleted file mode 100644
index 11a8128..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_14 {
-
- public int run(ITest test) {
- int a = 123;
- int b = 345;
- if(test.testArgsOrder(64, 2) == 32)
- {
- if(a == 123)
- if(b == 345)
- return 1;
- }
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.d
deleted file mode 100644
index 3c972ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_16.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 6
-
- const/high16 v3, 1065353216
- invoke-interface {v5, v3}, dot/junit/opcodes/invoke_interface/ITest/doit(F)V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.java
deleted file mode 100644
index f244ea3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_16 {
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d
deleted file mode 100644
index f792a3b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_18.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 8
- new-instance v2, dot/junit/opcodes/invoke_interface/ITestImplAbstract
- invoke-interface {v2}, dot/junit/opcodes/invoke_interface/ITestImplAbstract/<init>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.java
deleted file mode 100644
index b9f9ccc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_18 {
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.d
deleted file mode 100644
index 9c5e86d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_2.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface {v6, v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.dfh
deleted file mode 100644
index d1d1886..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.dfh
+++ /dev/null
@@ -1,294 +0,0 @@
-// Processing 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.dex'...
-// Opened 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 0a295956
- 56 59 29 0A
-// parsed: offset 12, len 20: signature : 1dee...09a5
- 1D EE 44 4E 27 44 F2 88 7C 13 FE E3 09 B1 55 80 3C 7B 09 A5
-// parsed: offset 32, len 4: file_size : 664
- 98 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 528 (0x000210)
- 10 02 00 00
-// parsed: offset 56, len 4: string_ids_size : 11
- 0B 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 156 (0x00009c)
- 9C 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 176 (0x0000b0)
- B0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 212 (0x0000d4)
- D4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 244 (0x0000f4)
- F4 00 00 00
-// parsed: offset 104, len 4: data_size : 388
- 84 01 00 00
-// parsed: offset 108, len 4: data_off : 276 (0x000114)
- 14 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 342 (0x000156) "<init>"
- 56 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 350 (0x00015e) "I"
- 5E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 353 (0x000161) "IL"
- 61 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 357 (0x000165) "ILL"
- 65 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 362 (0x00016a) "Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_2;"
- 6A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 423 (0x0001a7) "Ljava/lang/Comparable;"
- A7 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 447 (0x0001bf) "Ljava/lang/Object;"
- BF 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 467 (0x0001d3) "T_invoke_interface_2.java"
- D3 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 494 (0x0001ee) "V"
- EE 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 497 (0x0001f1) "compareTo"
- F1 01 00 00
-// parsed: offset 152, len 4: [10] string_data_off: 508 (0x0001fc) "run"
- FC 01 00 00
-
-// type_ids:
-// parsed: offset 156, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 160, len 4: [1] descriptor_idx: 4 (0x000004) "Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_2;"
- 04 00 00 00
-// parsed: offset 164, len 4: [2] descriptor_idx: 5 (0x000005) "Ljava/lang/Comparable;"
- 05 00 00 00
-// parsed: offset 168, len 4: [3] descriptor_idx: 6 (0x000006) "Ljava/lang/Object;"
- 06 00 00 00
-// parsed: offset 172, len 4: [4] descriptor_idx: 8 (0x000008) "V"
- 08 00 00 00
-
-// proto_ids:
-// parsed: offset 176, len 12: [0]
-// shorty_idx: 3 (0x000003) "ILL"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 03 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 188, len 12: [1]
-// shorty_idx: 2 (0x000002) "IL"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 336 (0x000150)
- 02 00 00 00 00 00 00 00 50 01 00 00
-// parsed: offset 200, len 12: [2]
-// shorty_idx: 8 (0x000008) "V"
-// return_type_idx: 4 (0x000004) "V"
-// parameters_off: 0 (0x000000)
- 08 00 00 00 04 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 212, len 8: [0] class_idx: 1 (0x000001) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 01 00 02 00 00 00 00 00
-// parsed: offset 220, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 10 (0x00000a) "run"
- 01 00 00 00 0A 00 00 00
-// parsed: offset 228, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 9 (0x000009) "compareTo"
- 02 00 01 00 09 00 00 00
-// parsed: offset 236, len 8: [3] class_idx: 3 (0x000003) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 03 00 02 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 244, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_2;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 3 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 7 "T_invoke_interface_2.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 513 (0x000201)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 03 00 00 00 00 00 00 00 07 00 00 00 00 00 00 00 01 02 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_interface.d.T_invoke_interface_2.<init>"
- // parsed: offset 276, len 2: registers_size: 2
- 02 00
- // parsed: offset 278, len 2: ins_size: 1
- 01 00
- // parsed: offset 280, len 2: outs_size: 1
- 01 00
- // parsed: offset 282, len 2: tries_size: 0
- 00 00
- // parsed: offset 284, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 288, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 292, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0003
- 70 10 03 00 01 00
- // parsed: offset 298, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_interface.d.T_invoke_interface_2.run"
- // parsed: offset 300, len 2: registers_size: 8
- 08 00
- // parsed: offset 302, len 2: ins_size: 3
- 03 00
- // parsed: offset 304, len 2: outs_size: 2
- 02 00
- // parsed: offset 306, len 2: tries_size: 0
- 00 00
- // parsed: offset 308, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 312, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 316, len 6: |0000: invoke-interface {v6, v7}, Ljava/lang/Comparable;.compareTo:(Ljava/lang/Object;)I // method@0002
-//@mod 72 20 02 00 76 00
- 72 20 02 01 76 00
- // parsed: offset 322, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 324, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 326, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 2
- 02 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 2
- 02 00
- // parsed: offset 334, len 2: type_item [1] type_idx: 3
- 03 00
-// TYPE_LIST
- // parsed: offset 336, len 4: size: 1
- 01 00 00 00
- // parsed: offset 340, len 2: type_item [0] type_idx: 3
- 03 00
-// parsed: offset 342, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 350, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 353, len 4: TYPE_STRING_DATA_ITEM [2] "IL"
- 02 49 4C 00
-// parsed: offset 357, len 5: TYPE_STRING_DATA_ITEM [3] "ILL"
- 03 49 4C 4C 00
-// parsed: offset 362, len 61: TYPE_STRING_DATA_ITEM [4] "Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_2;"
- 3B 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 69 6E 74 65 72 66 61 63 65 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 69 6E 74 65 72 66 61 63 65 5F 32 3B 00
-// parsed: offset 423, len 24: TYPE_STRING_DATA_ITEM [5] "Ljava/lang/Comparable;"
- 16 4C 6A 61 76 61 2F 6C 61 6E 67 2F 43 6F 6D 70 61 72 61 62 6C 65 3B 00
-// parsed: offset 447, len 20: TYPE_STRING_DATA_ITEM [6] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 467, len 27: TYPE_STRING_DATA_ITEM [7] "T_invoke_interface_2.java"
- 19 54 5F 69 6E 76 6F 6B 65 5F 69 6E 74 65 72 66 61 63 65 5F 32 2E 6A 61 76 61 00
-// parsed: offset 494, len 3: TYPE_STRING_DATA_ITEM [8] "V"
- 01 56 00
-// parsed: offset 497, len 11: TYPE_STRING_DATA_ITEM [9] "compareTo"
- 09 63 6F 6D 70 61 72 65 54 6F 00
-// parsed: offset 508, len 5: TYPE_STRING_DATA_ITEM [10] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_2;"
- // parsed: offset 513, len 1: static_fields_size: 0
- 00
- // parsed: offset 514, len 1: instance_fields_size: 0
- 00
- // parsed: offset 515, len 1: direct_methods_size: 1
- 01
- // parsed: offset 516, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 517, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 518, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 521, len 2: code_off: 276 (0x000114)
- 94 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 523, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 524, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 525, len 2: code_off: 300 (0x00012c)
- AC 02
-// parsed: offset 527, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 528, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 532, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 544, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 11
- // offset: 112 (0x000070)
- 01 00 00 00 0B 00 00 00 70 00 00 00
- // parsed: offset 556, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 156 (0x00009c)
- 02 00 00 00 05 00 00 00 9C 00 00 00
- // parsed: offset 568, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 176 (0x0000b0)
- 03 00 00 00 03 00 00 00 B0 00 00 00
- // parsed: offset 580, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 212 (0x0000d4)
- 05 00 00 00 04 00 00 00 D4 00 00 00
- // parsed: offset 592, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 244 (0x0000f4)
- 06 00 00 00 01 00 00 00 F4 00 00 00
- // parsed: offset 604, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 276 (0x000114)
- 01 20 00 00 02 00 00 00 14 01 00 00
- // parsed: offset 616, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 2
- // offset: 328 (0x000148)
- 01 10 00 00 02 00 00 00 48 01 00 00
- // parsed: offset 628, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 11
- // offset: 342 (0x000156)
- 02 20 00 00 0B 00 00 00 56 01 00 00
- // parsed: offset 640, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 513 (0x000201)
- 00 20 00 00 01 00 00 00 01 02 00 00
- // parsed: offset 652, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 528 (0x000210)
- 00 10 00 00 01 00 00 00 10 02 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.d
deleted file mode 100644
index c2465e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_20.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_20
-.super java/lang/Object
-
-.field public static i I
-
-.method static <clinit>()V
-.limit regs 2
-Label0:
- const/4 v1, 0
- sput v1, dot.junit.opcodes.invoke_interface.d.T_invoke_interface_20.i I
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 5
-
- invoke-interface {v3}, dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.java
deleted file mode 100644
index f40b587..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_20 {
-
- public static int i = 0;
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.d
deleted file mode 100644
index f8b0dea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_21.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 9
-
- const-wide v4, 64
- invoke-interface {v8, v4, v5}, dot/junit/opcodes/invoke_interface/ITest/testArgsOrder(II)I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.java
deleted file mode 100644
index f777a6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_21 {
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_22.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_22.d
deleted file mode 100644
index 7c27ad2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_22.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_22.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_22
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- new-instance v0, dot/junit/opcodes/invoke_interface/ITestImpl
-
- invoke-interface {v0}, dot/junit/opcodes/invoke_interface/ITest/doit()V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d
deleted file mode 100644
index debf41a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d
+++ /dev/null
@@ -1,29 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_3.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_3
-.super java/lang/Object
-
-
-.method public <init>(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 5
-Label0:
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- invoke-interface {v4}, dot/junit/opcodes/invoke_interface/ITest/doit()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.java
deleted file mode 100644
index 8c63c18..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_3 {
-
- public T_invoke_interface_3 (ITest test) {
- test.doit();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4.d
deleted file mode 100644
index a8de67b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_4.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-interface {v7}, dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4/test()V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4.java
deleted file mode 100644
index 4f751fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-
-public class T_invoke_interface_4 {
- public void test() {
- }
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.d
deleted file mode 100644
index adf7abe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.d
+++ /dev/null
@@ -1,28 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_5.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_5
-.super java/lang/Object
-
-
-.method public <init>(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 2
-
- invoke-direct {v0}, java/lang/Object/<init>()V
-
- invoke-interface {}, dot/junit/opcodes/invoke_interface/ITest/doit()V
-
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.java
deleted file mode 100644
index 7615134..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-
-public class T_invoke_interface_5 {
-
- public T_invoke_interface_5(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.d
deleted file mode 100644
index c96f200..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_7.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 5
-
- invoke-interface {v4}, dot/junit/opcodes/invoke_interface/ITest/doitN()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.java
deleted file mode 100644
index b249ded..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface.d;
-
-import dot.junit.opcodes.invoke_interface.ITest;
-
-public class T_invoke_interface_7 {
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_8.d
deleted file mode 100644
index 8bf956e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_8.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface {v8, v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_9.d
deleted file mode 100644
index 2fc4a90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_9.java
-.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface {v6}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITest.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITest.java
deleted file mode 100644
index 404787e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range;
-
-public interface ITest {
- public void doit();
- public void doit(int i);
- public void doitNative();
- public int test(int a);
- public int testArgsOrder(int a, int b);
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITestImpl.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITestImpl.java
deleted file mode 100644
index e1d871a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITestImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range;
-
-
-
-public class ITestImpl implements ITest {
- public void doit() {
- // impl
- }
-
- public void doit(int i) {
- //
- }
-
- public native void doitNative();
-
- public int test(int a) {
- if (a == 999) return 195;
- return 0;
- }
-
- public int testArgsOrder(int a, int b) {
- return a / b;
- }
-
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITestImplAbstract.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITestImplAbstract.java
deleted file mode 100644
index aee0064..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/ITestImplAbstract.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range;
-
-
-public abstract class ITestImplAbstract implements ITest {
- abstract public void doit();
- abstract public void doit(int i);
- public native void doitNative();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
deleted file mode 100644
index abb4855..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_1;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_11;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_12;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_13;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_14;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_16;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_18;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_20;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_21;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_3;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_4;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_5;
-import dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_7;
-
-public class Test_invoke_interface_range extends DxTestCase {
-
- /**
- * @title invoke interface method
- */
- public void testN1() {
- T_invoke_interface_range_1 t = new T_invoke_interface_range_1();
- assertEquals(0, t.run("aa", "aa"));
- assertEquals(-1, t.run("aa", "bb"));
- assertEquals(1, t.run("bb", "aa"));
- }
-
- /**
- * @title Check that new frame is created by invoke_interface_range and
- * arguments are passed to method
- */
- public void testN2() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_14
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- T_invoke_interface_range_14 t = new T_invoke_interface_range_14();
- ITestImpl impl = new ITestImpl();
- assertEquals(1, t.run(impl));
- }
-
-
-
- /**
- * @title objref is null
- */
- public void testE3() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_3
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- try {
- new T_invoke_interface_range_3(null);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title object doesn't implement interface
- */
- public void testE4() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_11
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- T_invoke_interface_range_11 t = new T_invoke_interface_range_11();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE5() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_12
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- T_invoke_interface_range_12 t = new T_invoke_interface_range_12();
- ITestImpl impl = new ITestImpl();
- try {
- t.run(impl);
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
- }
-
- /**
- * @title Attempt to invoke abstract method
- */
- public void testE6() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_13
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImplAbstract
- T_invoke_interface_range_13 t = new T_invoke_interface_range_13();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError e) {
- // expected
- }
- }
-
- /**
- * @constraint A17
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A17
- * @title The referenced method_id must belong to an interface (not a class).
- */
- public void testVFE2() {
- try {
- new T_invoke_interface_range_4().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments
- */
- public void testVFE5() {
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_5(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title int is passed instead of objref
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title number of arguments passed to method
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title invoke-interface may not be used to call <init>.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImplAbstract
- try {
- new T_invoke_interface_range_18().run(new ITestImpl());
- fail("expected InstantiationError");
- } catch (InstantiationError t) {
- }
- }
-
- /**
- * @constraint A15
- * @title invoke-interface may not be used to call <clinit>.
- */
- public void testVFE11() {
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_20().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_21().run(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call undefined method.
- */
- public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_7
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_7().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_16
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_16().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE21() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_22
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.d
deleted file mode 100644
index 70fee02..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_1.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface/range {v6..v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.java
deleted file mode 100644
index fa6fd15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-public class T_invoke_interface_range_1 {
-
- public int run(Comparable c, Object o) {
- return c.compareTo(o);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10.d
deleted file mode 100644
index d78f6c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_10.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
- const v6, 1243
- invoke-interface/range {v6..v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.d
deleted file mode 100644
index d0fe868..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_11.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- invoke-interface/range {v4}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.java
deleted file mode 100644
index d990613..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-
-public class T_invoke_interface_range_11 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.d
deleted file mode 100644
index 7463912..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_12.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 5
-
- invoke-interface/range {v4}, dot/junit/opcodes/invoke_interface_range/ITest/doitNative()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.java
deleted file mode 100644
index b5a2167..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_12 {
-
- public void run(ITest test) {
- test.doitNative();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.d
deleted file mode 100644
index 4b0ea65..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_13.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_13
-.super dot/junit/opcodes/invoke_interface_range/ITestImplAbstract
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_interface_range/ITestImplAbstract/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 7
-
- invoke-interface/range {v6}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.java
deleted file mode 100644
index 1d9989b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-
-public class T_invoke_interface_range_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.d
deleted file mode 100644
index ce6cd80..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.d
+++ /dev/null
@@ -1,55 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_14.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)I
-.limit regs 9
- const v1, 123
- const v2, 345
-
- const v4, 64
- const v5, 2
- move-object v3, v8
- invoke-interface/range {v3..v5}, dot/junit/opcodes/invoke_interface_range/ITest/testArgsOrder(II)I
- move-result v4
- const v5, 32
- if-ne v4, v5, Label0
-
- const v5, 123
- if-ne v5, v1, Label0
-
- const v5, 345
- if-ne v5, v2, Label0
-
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.java
deleted file mode 100644
index ac996f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_14 {
-
- public int run(ITest test) {
- int a = 123;
- int b = 345;
- if(test.testArgsOrder(64, 2) == 32)
- {
- if(a == 123)
- if(b == 345)
- return 1;
- }
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.d
deleted file mode 100644
index 2cfcc5e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_16.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 6
-
- const/high16 v3, 1065353216
- move-object v2, v5
- invoke-interface/range {v2..v3}, dot/junit/opcodes/invoke_interface_range/ITest/doit(F)V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.java
deleted file mode 100644
index ada5988..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_16 {
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d
deleted file mode 100644
index 0174a71..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_18.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 8
- new-instance v2, dot/junit/opcodes/invoke_interface_range/ITestImplAbstract
- invoke-interface/range {v2}, dot/junit/opcodes/invoke_interface_range/ITestImplAbstract/<init>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.java
deleted file mode 100644
index 5c93b22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_18 {
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.d
deleted file mode 100644
index cd8bc3e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_2.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface/range {v6..v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.dfh
deleted file mode 100644
index 9bc316f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.dfh
+++ /dev/null
@@ -1,294 +0,0 @@
-// Processing 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.dex'...
-// Opened 'tools/cts/dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : f75b5e58
- 58 5E 5B F7
-// parsed: offset 12, len 20: signature : 8d58...fcad
- 8D 58 41 7D D6 50 6A 07 7B 67 E0 45 7B 76 2A 94 0C A4 FC AD
-// parsed: offset 32, len 4: file_size : 684
- AC 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 548 (0x000224)
- 24 02 00 00
-// parsed: offset 56, len 4: string_ids_size : 11
- 0B 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 156 (0x00009c)
- 9C 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 176 (0x0000b0)
- B0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 212 (0x0000d4)
- D4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 244 (0x0000f4)
- F4 00 00 00
-// parsed: offset 104, len 4: data_size : 408
- 98 01 00 00
-// parsed: offset 108, len 4: data_off : 276 (0x000114)
- 14 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 342 (0x000156) "<init>"
- 56 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 350 (0x00015e) "I"
- 5E 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 353 (0x000161) "IL"
- 61 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 357 (0x000165) "ILL"
- 65 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 362 (0x00016a) "Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2;"
- 6A 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 435 (0x0001b3) "Ljava/lang/Comparable;"
- B3 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 459 (0x0001cb) "Ljava/lang/Object;"
- CB 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 479 (0x0001df) "T_invoke_interface_range_2.java"
- DF 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 512 (0x000200) "V"
- 00 02 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 515 (0x000203) "compareTo"
- 03 02 00 00
-// parsed: offset 152, len 4: [10] string_data_off: 526 (0x00020e) "run"
- 0E 02 00 00
-
-// type_ids:
-// parsed: offset 156, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 160, len 4: [1] descriptor_idx: 4 (0x000004) "Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2;"
- 04 00 00 00
-// parsed: offset 164, len 4: [2] descriptor_idx: 5 (0x000005) "Ljava/lang/Comparable;"
- 05 00 00 00
-// parsed: offset 168, len 4: [3] descriptor_idx: 6 (0x000006) "Ljava/lang/Object;"
- 06 00 00 00
-// parsed: offset 172, len 4: [4] descriptor_idx: 8 (0x000008) "V"
- 08 00 00 00
-
-// proto_ids:
-// parsed: offset 176, len 12: [0]
-// shorty_idx: 3 (0x000003) "ILL"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 03 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 188, len 12: [1]
-// shorty_idx: 2 (0x000002) "IL"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 336 (0x000150)
- 02 00 00 00 00 00 00 00 50 01 00 00
-// parsed: offset 200, len 12: [2]
-// shorty_idx: 8 (0x000008) "V"
-// return_type_idx: 4 (0x000004) "V"
-// parameters_off: 0 (0x000000)
- 08 00 00 00 04 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 212, len 8: [0] class_idx: 1 (0x000001) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 01 00 02 00 00 00 00 00
-// parsed: offset 220, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 10 (0x00000a) "run"
- 01 00 00 00 0A 00 00 00
-// parsed: offset 228, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 9 (0x000009) "compareTo"
- 02 00 01 00 09 00 00 00
-// parsed: offset 236, len 8: [3] class_idx: 3 (0x000003) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 03 00 02 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 244, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 3 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 7 "T_invoke_interface_range_2.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 531 (0x000213)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 03 00 00 00 00 00 00 00 07 00 00 00 00 00 00 00 13 02 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_2.<init>"
- // parsed: offset 276, len 2: registers_size: 2
- 02 00
- // parsed: offset 278, len 2: ins_size: 1
- 01 00
- // parsed: offset 280, len 2: outs_size: 1
- 01 00
- // parsed: offset 282, len 2: tries_size: 0
- 00 00
- // parsed: offset 284, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 288, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 292, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0003
- 70 10 03 00 01 00
- // parsed: offset 298, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_2.run"
- // parsed: offset 300, len 2: registers_size: 8
- 08 00
- // parsed: offset 302, len 2: ins_size: 3
- 03 00
- // parsed: offset 304, len 2: outs_size: 2
- 02 00
- // parsed: offset 306, len 2: tries_size: 0
- 00 00
- // parsed: offset 308, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 312, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 316, len 6: |0000: invoke-interface/range {v6..v7}, Ljava/lang/Comparable;.compareTo:(Ljava/lang/Object;)I // method@0002
-//@mod 78 02 02 00 06 00
- 78 02 02 01 06 00
- // parsed: offset 322, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 324, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 326, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 2
- 02 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 2
- 02 00
- // parsed: offset 334, len 2: type_item [1] type_idx: 3
- 03 00
-// TYPE_LIST
- // parsed: offset 336, len 4: size: 1
- 01 00 00 00
- // parsed: offset 340, len 2: type_item [0] type_idx: 3
- 03 00
-// parsed: offset 342, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 350, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 353, len 4: TYPE_STRING_DATA_ITEM [2] "IL"
- 02 49 4C 00
-// parsed: offset 357, len 5: TYPE_STRING_DATA_ITEM [3] "ILL"
- 03 49 4C 4C 00
-// parsed: offset 362, len 73: TYPE_STRING_DATA_ITEM [4] "Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2;"
- 47 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 69 6E 74 65 72 66 61 63 65 5F 72 61 6E 67 65 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 69 6E 74 65 72 66 61 63 65 5F 72 61 6E 67 65 5F 32 3B 00
-// parsed: offset 435, len 24: TYPE_STRING_DATA_ITEM [5] "Ljava/lang/Comparable;"
- 16 4C 6A 61 76 61 2F 6C 61 6E 67 2F 43 6F 6D 70 61 72 61 62 6C 65 3B 00
-// parsed: offset 459, len 20: TYPE_STRING_DATA_ITEM [6] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 479, len 33: TYPE_STRING_DATA_ITEM [7] "T_invoke_interface_range_2.java"
- 1F 54 5F 69 6E 76 6F 6B 65 5F 69 6E 74 65 72 66 61 63 65 5F 72 61 6E 67 65 5F 32 2E 6A 61 76 61 00
-// parsed: offset 512, len 3: TYPE_STRING_DATA_ITEM [8] "V"
- 01 56 00
-// parsed: offset 515, len 11: TYPE_STRING_DATA_ITEM [9] "compareTo"
- 09 63 6F 6D 70 61 72 65 54 6F 00
-// parsed: offset 526, len 5: TYPE_STRING_DATA_ITEM [10] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2;"
- // parsed: offset 531, len 1: static_fields_size: 0
- 00
- // parsed: offset 532, len 1: instance_fields_size: 0
- 00
- // parsed: offset 533, len 1: direct_methods_size: 1
- 01
- // parsed: offset 534, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 535, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 536, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 539, len 2: code_off: 276 (0x000114)
- 94 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 541, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 542, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 543, len 2: code_off: 300 (0x00012c)
- AC 02
-// parsed: offset 545, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 548, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 552, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 564, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 11
- // offset: 112 (0x000070)
- 01 00 00 00 0B 00 00 00 70 00 00 00
- // parsed: offset 576, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 156 (0x00009c)
- 02 00 00 00 05 00 00 00 9C 00 00 00
- // parsed: offset 588, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 176 (0x0000b0)
- 03 00 00 00 03 00 00 00 B0 00 00 00
- // parsed: offset 600, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 212 (0x0000d4)
- 05 00 00 00 04 00 00 00 D4 00 00 00
- // parsed: offset 612, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 244 (0x0000f4)
- 06 00 00 00 01 00 00 00 F4 00 00 00
- // parsed: offset 624, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 276 (0x000114)
- 01 20 00 00 02 00 00 00 14 01 00 00
- // parsed: offset 636, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 2
- // offset: 328 (0x000148)
- 01 10 00 00 02 00 00 00 48 01 00 00
- // parsed: offset 648, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 11
- // offset: 342 (0x000156)
- 02 20 00 00 0B 00 00 00 56 01 00 00
- // parsed: offset 660, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 531 (0x000213)
- 00 20 00 00 01 00 00 00 13 02 00 00
- // parsed: offset 672, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 548 (0x000224)
- 00 10 00 00 01 00 00 00 24 02 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.d
deleted file mode 100644
index 3dd1bcd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_20.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_20
-.super java/lang/Object
-
-.field public static i I
-
-.method static <clinit>()V
-.limit regs 2
-Label0:
- const/4 v1, 0
- sput v1, dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_20.i I
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 5
-
- invoke-interface/range {v3}, dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.java
deleted file mode 100644
index a28964c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_20 {
-
- public static int i = 0;
-
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.d
deleted file mode 100644
index f8b1b95..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_21.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_21
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 9
-
- const-wide v4, 64
- move-object v3, v8
- invoke-interface/range {v3..v5}, dot/junit/opcodes/invoke_interface_range/ITest/testArgsOrder(II)I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.java
deleted file mode 100644
index b26ae98..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_21 {
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22.d
deleted file mode 100644
index 3b2a521..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_22.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_22
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- new-instance v0, dot/junit/opcodes/invoke_interface_range/ITestImpl
-
- invoke-interface/range {v0}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d
deleted file mode 100644
index ca4948d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d
+++ /dev/null
@@ -1,29 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_3.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_3
-.super java/lang/Object
-
-
-.method public <init>(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 5
-Label0:
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- invoke-interface/range {v4}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.java
deleted file mode 100644
index f39dca5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_3 {
-
- public T_invoke_interface_range_3 (ITest test) {
- test.doit();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4.d
deleted file mode 100644
index 8a21324..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_4.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-interface/range {v7}, dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4/test()V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4.java
deleted file mode 100644
index aa0b9ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-
-public class T_invoke_interface_range_4 {
- public void test() {
- }
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.d
deleted file mode 100644
index a0e0905..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.d
+++ /dev/null
@@ -1,28 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_5.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_5
-.super java/lang/Object
-
-
-.method public <init>(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 2
-
- invoke-direct {v0}, java/lang/Object/<init>()V
-
- invoke-interface/range {}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
-
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.java
deleted file mode 100644
index cfbcd8c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_5 {
- public T_invoke_interface_range_5(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.d
deleted file mode 100644
index 13a63d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_7.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 5
-
- invoke-interface/range {v4}, dot/junit/opcodes/invoke_interface_range/ITest/doitN()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.java
deleted file mode 100644
index 82b6c7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_interface_range.d;
-
-import dot.junit.opcodes.invoke_interface_range.ITest;
-
-public class T_invoke_interface_range_7 {
- public void run(ITest test) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8.d
deleted file mode 100644
index f81692c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_8.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- move-object v6, v8
- invoke-interface/range {v6..v7}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9.d
deleted file mode 100644
index cd73a85..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_interface_range_9.java
-.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-.limit regs 8
-
- invoke-interface/range {v6}, java/lang/Comparable/compareTo(Ljava/lang/Object;)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/TestClass.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/TestClass.java
deleted file mode 100644
index 3db9673..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/TestClass.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static;
-
-public class TestClass {
-
- public static int test(){
- return 777;
- }
-
- public static int test1(int i1){
- int i = i1 + 5;
- return i;
- }
-
- public static int testArgsOrder(int i1, int i2){
- int a = 3454;
- int b = 2302;
- int i = i1 / i2;
- return i;
- }
-
- protected static void testProtected() {
-
- }
-
-
- private static void testPvt(){
-
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
deleted file mode 100644
index c7b77aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_1;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_13;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_14;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_15;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_17;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_18;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_19;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_2;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_4;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_5;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_6;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_7;
-import dot.junit.opcodes.invoke_static.d.T_invoke_static_8;
-
-
-
-public class Test_invoke_static extends DxTestCase {
-
- /**
- * @title Static method from library class Math
- */
- public void testN1() {
- T_invoke_static_1 t = new T_invoke_static_1();
- assertEquals(1234567, t.run());
- }
-
- /**
- * @title Static method from user class
- */
- public void testN2() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_2
- //@uses dot.junit.opcodes.invoke_static.TestClass
- T_invoke_static_2 t = new T_invoke_static_2();
- assertEquals(777, t.run());
- }
-
- /**
- * @title Check that <clinit> is called
- */
- public void testN3() {
- assertEquals(123456789l, T_invoke_static_4.run());
- }
-
-
- /**
- * @title Check that new frame is created by invoke_static and
- * arguments are passed to method
- */
- public void testN5() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_15
- //@uses dot.junit.opcodes.invoke_static.TestClass
- T_invoke_static_15 t = new T_invoke_static_15();
- assertTrue(t.run());
- }
-
- /**
- * @title Static protected method from other class in the same package
- */
- public void testN6() {
- T_invoke_static_18 t = new T_invoke_static_18();
- assertEquals(888, t.run());
- }
-
- /**
- * @title Native method can't be linked
- *
- */
- public void testE2() {
- T_invoke_static_6 t = new T_invoke_static_6();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE7() {
- T_invoke_static_14 t = new T_invoke_static_14();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A13
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <clinit> may not be called using invoke-static
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments passed to method.
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <init> may not be called using invoke_static
- */
- public void testVFE5() {
- try {
- new T_invoke_static_19().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to call non-static method.
- */
- public void testVFE7() {
- try {
- new T_invoke_static_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call undefined method.
- */
- public void testVFE8() {
- try {
- new T_invoke_static_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call private method of other class.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_8
- //@uses dot.junit.opcodes.invoke_static.TestClass
- try {
- new T_invoke_static_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_13
- //@uses dot.junit.opcodes.invoke_static.TestClass
- try {
- new T_invoke_static_13().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
-
- /**
- * @constraint B12
- * @title Attempt to call protected method of unrelated class.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_17
- //@uses dot.junit.opcodes.invoke_static.TestClass
- try {
- new T_invoke_static_17().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A13
- * @title attempt to invoke interface method
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.d
deleted file mode 100644
index 04c88aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_1.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1234567
- invoke-static {v1}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.java
deleted file mode 100644
index a6b001f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_1 {
-
- public int run() {
- return Math.abs(-1234567);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_10.d
deleted file mode 100644
index 365afbb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_10.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_10.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_10
-.super java/lang/Object
-
-
-
-.method static <clinit>()V
- return-void
-.end method
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-static {}, dot/junit/opcodes/invoke_static/d/T_invoke_static_10/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_11.d
deleted file mode 100644
index 227b52c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_11.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1234567
- invoke-static {}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_13.d
deleted file mode 100644
index 2e78a06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_13.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_13.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 3.14
-
- invoke-static {v1}, dot/junit/opcodes/invoke_static/TestClass/test1(F)I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_13.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_13.java
deleted file mode 100644
index a51532c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d
deleted file mode 100644
index ed2aa2b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d
+++ /dev/null
@@ -1,50 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestClassInitError.java
-.class public dot.junit.opcodes.invoke_static.d.TestClassInitError
-.super java/lang/Object
-
-.method static public <clinit>()V
-.limit regs 2
-
- const v0, 1
- const v1, 0
- div-int v0, v0, v1
-.end method
-
-.method static public test()V
- return-void
-.end method
-
-.source T_invoke_static_14.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static {}, dot/junit/opcodes/invoke_static/d/TestClassInitError/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.java
deleted file mode 100644
index c4efea3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_14 {
-
- public void run(){
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.d
deleted file mode 100644
index 58bccb9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.d
+++ /dev/null
@@ -1,56 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_15.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 6
-
- const v1, 123
- const v2, 345
-
- const v3, 12
- const v4, 6
-
- invoke-static {v3, v4}, dot/junit/opcodes/invoke_static/TestClass/testArgsOrder(II)I
-
- move-result v3
- const v4, 2
- if-ne v3, v4, Label0
-
- const v4, 123
- if-ne v1, v4, Label0
-
- const v4, 345
- if-ne v2, v4, Label0
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.java
deleted file mode 100644
index 0db7ec5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-import dot.junit.opcodes.invoke_static.TestClass;
-
-public class T_invoke_static_15 {
-
- public boolean run(){
- int i = 123;
- int j = 345;
- if(TestClass.testArgsOrder(12, 2) == 6)
- if(i == 123)
- if(j == 345)
- return true;
- return false;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_16.d
deleted file mode 100644
index 883edbe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_16.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_16.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-static {v3}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.d
deleted file mode 100644
index 1ce4ed4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_17.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static {}, dot/junit/opcodes/invoke_static/TestClass/testProtected()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.java
deleted file mode 100644
index 194ef10..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_18.d
deleted file mode 100644
index 7332bce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_18.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestProtected.java
-.class public dot.junit.opcodes.invoke_static.d.TestProtected
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method protected static testP()I
-.limit regs 2
- const v0, 888
- return v0
-.end method
-
-
-.source T_invoke_static_18.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-static {}, dot/junit/opcodes/invoke_static/d/TestProtected/testP()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_18.java
deleted file mode 100644
index 776b488..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_18.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-class TestProtected {
- static protected int testP() {
- return 888;
- }
-}
-
-public class T_invoke_static_18 {
-
- public int run() {
- return TestProtected.testP();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.d
deleted file mode 100644
index e94e2a3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_19.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_19
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
-
- invoke-static {}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
- const/4 v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.java
deleted file mode 100644
index 1682c92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_19 {
-
- public int run() {
- return Math.abs(-1234567);
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.d
deleted file mode 100644
index 1c53ad3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_2.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-static {}, dot/junit/opcodes/invoke_static/TestClass/test()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.java
deleted file mode 100644
index 2e6bfd9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-import dot.junit.opcodes.invoke_static.TestClass;
-
-public class T_invoke_static_2 {
-
- public int run() {
- return TestClass.test();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_20.d
deleted file mode 100644
index 9ef67a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_20.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_20
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const-wide v1, 1
- invoke-static {v1}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_24.d
deleted file mode 100644
index 9a2871f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_24.d
+++ /dev/null
@@ -1,58 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_static.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-; =====================================
-
-.source TTestInterfaceImpl.java
-.class public dot.junit.opcodes.invoke_static.d.TTestInterfaceImpl
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_static.d.TTestInterface
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-; =====================================
-
-.source T_invoke_static_24.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_24
-.super dot/junit/opcodes/invoke_static/d/TTestInterfaceImpl
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_static/d/TTestInterfaceImpl/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-static {v7}, dot/junit/opcodes/invoke_static/d/TTestInterface/test()V
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.d
deleted file mode 100644
index 321761f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_3.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1234567
- invoke-static {v1}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.dfh
deleted file mode 100644
index 9c4f6eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.dfh
+++ /dev/null
@@ -1,283 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 13655765
- 65 57 65 13
-// parsed: offset 12, len 20: signature : a1e9...1ca1
- A1 E9 92 EC DD 74 44 53 75 44 CF F1 C4 AF EA F3 CB 80 1C A1
-// parsed: offset 32, len 4: file_size : 632
- 78 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 496 (0x0001f0)
- F0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 10
- 0A 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 240 (0x0000f0)
- F0 00 00 00
-// parsed: offset 104, len 4: data_size : 360
- 68 01 00 00
-// parsed: offset 108, len 4: data_off : 272 (0x000110)
- 10 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 334 (0x00014e) "<init>"
- 4E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 342 (0x000156) "I"
- 56 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "II"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 349 (0x00015d) "Ldot/junit/opcodes/invoke_static/d/T_invoke_static_3;"
- 5D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 404 (0x000194) "Ljava/lang/Math;"
- 94 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 422 (0x0001a6) "Ljava/lang/Object;"
- A6 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 442 (0x0001ba) "T_invoke_static_3.java"
- BA 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 466 (0x0001d2) "V"
- D2 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 469 (0x0001d5) "abs"
- D5 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 474 (0x0001da) "run"
- DA 01 00 00
-
-// type_ids:
-// parsed: offset 152, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 156, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/invoke_static/d/T_invoke_static_3;"
- 03 00 00 00
-// parsed: offset 160, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Math;"
- 04 00 00 00
-// parsed: offset 164, len 4: [3] descriptor_idx: 5 (0x000005) "Ljava/lang/Object;"
- 05 00 00 00
-// parsed: offset 168, len 4: [4] descriptor_idx: 7 (0x000007) "V"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 172, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 184, len 12: [1]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 02 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 196, len 12: [2]
-// shorty_idx: 7 (0x000007) "V"
-// return_type_idx: 4 (0x000004) "V"
-// parameters_off: 0 (0x000000)
- 07 00 00 00 04 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 208, len 8: [0] class_idx: 1 (0x000001) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 01 00 02 00 00 00 00 00
-// parsed: offset 216, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 9 (0x000009) "run"
- 01 00 00 00 09 00 00 00
-// parsed: offset 224, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "abs"
- 02 00 01 00 08 00 00 00
-// parsed: offset 232, len 8: [3] class_idx: 3 (0x000003) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 03 00 02 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 240, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/invoke_static/d/T_invoke_static_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 3 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 6 "T_invoke_static_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 479 (0x0001df)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 03 00 00 00 00 00 00 00 06 00 00 00 00 00 00 00 DF 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_static.d.T_invoke_static_3.<init>"
- // parsed: offset 272, len 2: registers_size: 2
- 02 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 1
- 01 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 288, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0003
- 70 10 03 00 01 00
- // parsed: offset 294, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_static.d.T_invoke_static_3.run"
- // parsed: offset 296, len 2: registers_size: 3
- 03 00
- // parsed: offset 298, len 2: ins_size: 1
- 01 00
- // parsed: offset 300, len 2: outs_size: 1
- 01 00
- // parsed: offset 302, len 2: tries_size: 0
- 00 00
- // parsed: offset 304, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 308, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 312, len 6: |0000: const v1, #float nan // #0xffed2979 int
- 14 01 79 29 ED FF
- // parsed: offset 318, len 6: |0003: invoke-static {v1}, Ljava/lang/Math;.abs:(I)I // method@0002
-//@mod 71 10 02 00 01 00
- 71 10 02 01 01 00
- // parsed: offset 324, len 2: |0006: move-result v0
- 0A 00
- // parsed: offset 326, len 2: |0007: return v0
- 0F 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 1
- 01 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 334, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 342, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 345, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 349, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/invoke_static/d/T_invoke_static_3;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 73 74 61 74 69 63 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 73 74 61 74 69 63 5F 33 3B 00
-// parsed: offset 404, len 18: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Math;"
- 10 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4D 61 74 68 3B 00
-// parsed: offset 422, len 20: TYPE_STRING_DATA_ITEM [5] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 442, len 24: TYPE_STRING_DATA_ITEM [6] "T_invoke_static_3.java"
- 16 54 5F 69 6E 76 6F 6B 65 5F 73 74 61 74 69 63 5F 33 2E 6A 61 76 61 00
-// parsed: offset 466, len 3: TYPE_STRING_DATA_ITEM [7] "V"
- 01 56 00
-// parsed: offset 469, len 5: TYPE_STRING_DATA_ITEM [8] "abs"
- 03 61 62 73 00
-// parsed: offset 474, len 5: TYPE_STRING_DATA_ITEM [9] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_static/d/T_invoke_static_3;"
- // parsed: offset 479, len 1: static_fields_size: 0
- 00
- // parsed: offset 480, len 1: instance_fields_size: 0
- 00
- // parsed: offset 481, len 1: direct_methods_size: 1
- 01
- // parsed: offset 482, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 483, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 484, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 487, len 2: code_off: 272 (0x000110)
- 90 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 489, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 490, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 491, len 2: code_off: 296 (0x000128)
- A8 02
-// parsed: offset 493, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 496, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 500, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 512, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 10
- // offset: 112 (0x000070)
- 01 00 00 00 0A 00 00 00 70 00 00 00
- // parsed: offset 524, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 152 (0x000098)
- 02 00 00 00 05 00 00 00 98 00 00 00
- // parsed: offset 536, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 172 (0x0000ac)
- 03 00 00 00 03 00 00 00 AC 00 00 00
- // parsed: offset 548, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 208 (0x0000d0)
- 05 00 00 00 04 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 240 (0x0000f0)
- 06 00 00 00 01 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 272 (0x000110)
- 01 20 00 00 02 00 00 00 10 01 00 00
- // parsed: offset 584, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 328 (0x000148)
- 01 10 00 00 01 00 00 00 48 01 00 00
- // parsed: offset 596, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 10
- // offset: 334 (0x00014e)
- 02 20 00 00 0A 00 00 00 4E 01 00 00
- // parsed: offset 608, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 479 (0x0001df)
- 00 20 00 00 01 00 00 00 DF 01 00 00
- // parsed: offset 620, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 496 (0x0001f0)
- 00 10 00 00 01 00 00 00 F0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.d
deleted file mode 100644
index 4212854..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_4.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_4
-.super java/lang/Object
-
-.field static val J
-
-.method static <clinit>()V
-.limit regs 2
-
- const-wide/32 v0, 123456789
- sput-wide v0, dot.junit.opcodes.invoke_static.d.T_invoke_static_4.val J
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 4
-Label0:
- sget-wide v2, dot.junit.opcodes.invoke_static.d.T_invoke_static_4.val J
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.java
deleted file mode 100644
index c9e1dd6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_4 {
-
- static long val = 123456789l;
-
- public static long run() {
- return val;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.d
deleted file mode 100644
index a3c8c91..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_5.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const/4 v2, 5
- invoke-static {v2}, dot/junit/opcodes/invoke_static/d/T_invoke_static_5/test(I)I
- move-result v0
- return v0
-.end method
-
-.method public test(I)I
-.limit regs 5
-
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.java
deleted file mode 100644
index ace37b8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_5 {
- public int run() {
- return 0;
- }
- public int test(int i) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_6.d
deleted file mode 100644
index 969e499..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_6.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static native test()V
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static {}, dot/junit/opcodes/invoke_static/d/T_invoke_static_6/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_6.java
deleted file mode 100644
index 1cdffb1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_6.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_6 {
-
- public static native void test();
-
- public void run() {
- test();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.d
deleted file mode 100644
index b58d3b2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_7.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static test()V
-.limit regs 0
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static {}, dot/junit/opcodes/invoke_static/d/T_invoke_static_7/testN()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.java
deleted file mode 100644
index 55a2327..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_7 {
- public static void test() {
- }
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.d
deleted file mode 100644
index 9a4d964..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_8.java
-.class public dot.junit.opcodes.invoke_static.d.T_invoke_static_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
- invoke-static {}, dot/junit/opcodes/invoke_static/TestClass/testPvt()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.java
deleted file mode 100644
index 61acbc9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static.d;
-
-public class T_invoke_static_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/TestClass.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/TestClass.java
deleted file mode 100644
index 90f65a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/TestClass.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range;
-
-public class TestClass {
-
- public static int test(){
- return 777;
- }
-
- public static int test1(int i1){
- int i = i1 + 5;
- return i;
- }
-
- public static int testArgsOrder(int i1, int i2){
- int a = 3454;
- int b = 2302;
- int i = i1 / i2;
- return i;
- }
-
- protected static void testProtected() {
-
- }
-
-
- private static void testPvt(){
-
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
deleted file mode 100644
index c62b333..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_1;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_13;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_14;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_15;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_17;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_18;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_19;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_2;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_4;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_5;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_6;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_7;
-import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_8;
-
-
-
-public class Test_invoke_static_range extends DxTestCase {
-
- /**
- * @title Static method from library class Math
- */
- public void testN1() {
- T_invoke_static_range_1 t = new T_invoke_static_range_1();
- assertEquals(1234567, t.run());
- }
-
- /**
- * @title Static method from user class
- */
- public void testN2() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_2
- //@uses dot.junit.opcodes.invoke_static_range.TestClass
- T_invoke_static_range_2 t = new T_invoke_static_range_2();
- assertEquals(777, t.run());
- }
-
- /**
- * @title Big number of registers
- */
- public void testN3() {
- assertEquals(1, T_invoke_static_range_4.run());
- }
-
-
- /**
- * @title Check that new frame is created by invoke_static_range and
- * arguments are passed to method
- */
- public void testN5() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_15
- //@uses dot.junit.opcodes.invoke_static_range.TestClass
- T_invoke_static_range_15 t = new T_invoke_static_range_15();
- assertTrue(t.run());
- }
-
- /**
- * @title Static protected method from other class in the same package
- */
- public void testN6() {
- T_invoke_static_range_18 t = new T_invoke_static_range_18();
- assertEquals(888, t.run());
- }
-
- /**
- * @title Native method can't be linked
- *
- */
- public void testE2() {
- T_invoke_static_range_6 t = new T_invoke_static_range_6();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE7() {
- T_invoke_static_range_14 t = new T_invoke_static_range_14();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A14
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <clinit> may not be called using invoke_static_range
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments passed to method
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <init> may not be called using invoke_static_range
- */
- public void testVFE5() {
- try {
- new T_invoke_static_range_19().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to call non-static method.
- */
- public void testVFE7() {
- try {
- new T_invoke_static_range_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call undefined method.
- */
- public void testVFE8() {
- try {
- new T_invoke_static_range_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call private method of other class.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_8
- //@uses dot.junit.opcodes.invoke_static_range.TestClass
- try {
- new T_invoke_static_range_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_13
- //@uses dot.junit.opcodes.invoke_static_range.TestClass
- try {
- new T_invoke_static_range_13().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
-
- /**
- * @constraint B12
- * @title Attempt to call protected method of unrelated class.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_17
- //@uses dot.junit.opcodes.invoke_static_range.TestClass
- try {
- new T_invoke_static_range_17().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A14
- * @title attempt to invoke interface method
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.d
deleted file mode 100644
index 1f8dac7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_1.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1234567
- invoke-static/range {v1}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.java
deleted file mode 100644
index e95213e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_1 {
-
- public int run() {
- return Math.abs(-1234567);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10.d
deleted file mode 100644
index 994973f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_10.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_10
-.super java/lang/Object
-
-
-
-.method static <clinit>()V
- return-void
-.end method
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11.d
deleted file mode 100644
index 2b7131f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_11.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1234567
- invoke-static/range {}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_13.d
deleted file mode 100644
index dca327b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_13.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_13.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 3.14
-
- invoke-static/range {v1}, dot/junit/opcodes/invoke_static_range/TestClass/test1(F)I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_13.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_13.java
deleted file mode 100644
index b3278c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d
deleted file mode 100644
index e4c1bd3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d
+++ /dev/null
@@ -1,50 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestClassInitError.java
-.class public dot.junit.opcodes.invoke_static_range.d.TestClassInitError
-.super java/lang/Object
-
-.method static public <clinit>()V
-.limit regs 2
-
- const v0, 1
- const v1, 0
- div-int v0, v0, v1
-.end method
-
-.method static public test()V
- return-void
-.end method
-
-.source T_invoke_static_range_14.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/d/TestClassInitError/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.java
deleted file mode 100644
index b5b135b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_14 {
-
- public void run(){
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.d
deleted file mode 100644
index c56d3c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.d
+++ /dev/null
@@ -1,56 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_15.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 6
-
- const v1, 123
- const v2, 345
-
- const v3, 12
- const v4, 6
-
- invoke-static/range {v3..v4}, dot/junit/opcodes/invoke_static_range/TestClass/testArgsOrder(II)I
-
- move-result v3
- const v4, 2
- if-ne v3, v4, Label0
-
- const v4, 123
- if-ne v1, v4, Label0
-
- const v4, 345
- if-ne v2, v4, Label0
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.java
deleted file mode 100644
index 696de4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-import dot.junit.opcodes.invoke_static_range.TestClass;
-
-public class T_invoke_static_range_15 {
-
- public boolean run(){
- int i = 123;
- int j = 345;
- if(TestClass.testArgsOrder(12, 2) == 6)
- if(i == 123)
- if(j == 345)
- return true;
- return false;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16.d
deleted file mode 100644
index c66089b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_16.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-static/range {v3}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.d
deleted file mode 100644
index b2ce948..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_17.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_17
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/TestClass/testProtected()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.java
deleted file mode 100644
index 4b020b1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_18.d
deleted file mode 100644
index 19fec09..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_18.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestProtected.java
-.class public dot.junit.opcodes.invoke_static_range.d.TestProtected
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method protected static testP()I
-.limit regs 2
- const v0, 888
- return v0
-.end method
-
-
-.source T_invoke_static_range_18.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/d/TestProtected/testP()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_18.java
deleted file mode 100644
index 34d0098..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_18.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-class TestProtected {
- static protected int testP() {
- return 888;
- }
-}
-
-public class T_invoke_static_range_18 {
-
- public int run() {
- return TestProtected.testP();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.d
deleted file mode 100644
index 051df3f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_19.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_19
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
-
- invoke-static/range {}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
- const/4 v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.java
deleted file mode 100644
index 204e39a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_19 {
-
- public int run() {
- return Math.abs(-1234567);
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.d
deleted file mode 100644
index 67e9a13..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_2.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/TestClass/test()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.java
deleted file mode 100644
index eb5f3c8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-import dot.junit.opcodes.invoke_static_range.TestClass;
-
-public class T_invoke_static_range_2 {
-
- public int run() {
- return TestClass.test();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20.d
deleted file mode 100644
index 5819881..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_20.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_20
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const-wide v1, 1
- invoke-static/range {v1}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_24.d
deleted file mode 100644
index 6ee8671..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_24.d
+++ /dev/null
@@ -1,58 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_static_range.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-; =====================================
-
-.source TTestInterfaceImpl.java
-.class public dot.junit.opcodes.invoke_static_range.d.TTestInterfaceImpl
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_static_range.d.TTestInterface
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-; =====================================
-
-.source T_invoke_static_range_24.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24
-.super dot/junit/opcodes/invoke_static_range/d/TTestInterfaceImpl
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_static_range/d/TTestInterfaceImpl/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-static/range {v7}, dot/junit/opcodes/invoke_static_range/d/TTestInterface/test()V
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.d
deleted file mode 100644
index b3734a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_3.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -1234567
- invoke-static/range {v1}, java/lang/Math/abs(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.dfh
deleted file mode 100644
index 624ef70..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.dfh
+++ /dev/null
@@ -1,283 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 4c3e5bf7
- F7 5B 3E 4C
-// parsed: offset 12, len 20: signature : be81...32a4
- BE 81 F4 E7 AE A6 FA EE 02 66 A3 DF 71 03 38 38 F6 56 32 A4
-// parsed: offset 32, len 4: file_size : 648
- 88 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 512 (0x000200)
- 00 02 00 00
-// parsed: offset 56, len 4: string_ids_size : 10
- 0A 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 240 (0x0000f0)
- F0 00 00 00
-// parsed: offset 104, len 4: data_size : 376
- 78 01 00 00
-// parsed: offset 108, len 4: data_off : 272 (0x000110)
- 10 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 334 (0x00014e) "<init>"
- 4E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 342 (0x000156) "I"
- 56 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "II"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 349 (0x00015d) "Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3;"
- 5D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 416 (0x0001a0) "Ljava/lang/Math;"
- A0 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 434 (0x0001b2) "Ljava/lang/Object;"
- B2 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 454 (0x0001c6) "T_invoke_static_range_3.java"
- C6 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 484 (0x0001e4) "V"
- E4 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 487 (0x0001e7) "abs"
- E7 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 492 (0x0001ec) "run"
- EC 01 00 00
-
-// type_ids:
-// parsed: offset 152, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 156, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3;"
- 03 00 00 00
-// parsed: offset 160, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Math;"
- 04 00 00 00
-// parsed: offset 164, len 4: [3] descriptor_idx: 5 (0x000005) "Ljava/lang/Object;"
- 05 00 00 00
-// parsed: offset 168, len 4: [4] descriptor_idx: 7 (0x000007) "V"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 172, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 184, len 12: [1]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 02 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 196, len 12: [2]
-// shorty_idx: 7 (0x000007) "V"
-// return_type_idx: 4 (0x000004) "V"
-// parameters_off: 0 (0x000000)
- 07 00 00 00 04 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 208, len 8: [0] class_idx: 1 (0x000001) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 01 00 02 00 00 00 00 00
-// parsed: offset 216, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 9 (0x000009) "run"
- 01 00 00 00 09 00 00 00
-// parsed: offset 224, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "abs"
- 02 00 01 00 08 00 00 00
-// parsed: offset 232, len 8: [3] class_idx: 3 (0x000003) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 03 00 02 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 240, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 3 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 6 "T_invoke_static_range_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 497 (0x0001f1)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 03 00 00 00 00 00 00 00 06 00 00 00 00 00 00 00 F1 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_3.<init>"
- // parsed: offset 272, len 2: registers_size: 2
- 02 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 1
- 01 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 288, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0003
- 70 10 03 00 01 00
- // parsed: offset 294, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_3.run"
- // parsed: offset 296, len 2: registers_size: 3
- 03 00
- // parsed: offset 298, len 2: ins_size: 1
- 01 00
- // parsed: offset 300, len 2: outs_size: 1
- 01 00
- // parsed: offset 302, len 2: tries_size: 0
- 00 00
- // parsed: offset 304, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 308, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 312, len 6: |0000: const v1, #float nan // #0xffed2979 int
- 14 01 79 29 ED FF
- // parsed: offset 318, len 6: |0003: invoke-static/range {v1..v1}, Ljava/lang/Math;.abs:(I)I // method@0002
-//@mod 77 01 02 00 01 00
- 77 01 02 01 01 00
- // parsed: offset 324, len 2: |0006: move-result v0
- 0A 00
- // parsed: offset 326, len 2: |0007: return v0
- 0F 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 1
- 01 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 334, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 342, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 345, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 349, len 67: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3;"
- 41 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 73 74 61 74 69 63 5F 72 61 6E 67 65 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 73 74 61 74 69 63 5F 72 61 6E 67 65 5F 33 3B 00
-// parsed: offset 416, len 18: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Math;"
- 10 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4D 61 74 68 3B 00
-// parsed: offset 434, len 20: TYPE_STRING_DATA_ITEM [5] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 454, len 30: TYPE_STRING_DATA_ITEM [6] "T_invoke_static_range_3.java"
- 1C 54 5F 69 6E 76 6F 6B 65 5F 73 74 61 74 69 63 5F 72 61 6E 67 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 484, len 3: TYPE_STRING_DATA_ITEM [7] "V"
- 01 56 00
-// parsed: offset 487, len 5: TYPE_STRING_DATA_ITEM [8] "abs"
- 03 61 62 73 00
-// parsed: offset 492, len 5: TYPE_STRING_DATA_ITEM [9] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3;"
- // parsed: offset 497, len 1: static_fields_size: 0
- 00
- // parsed: offset 498, len 1: instance_fields_size: 0
- 00
- // parsed: offset 499, len 1: direct_methods_size: 1
- 01
- // parsed: offset 500, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 501, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 502, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 505, len 2: code_off: 272 (0x000110)
- 90 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 507, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 508, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 509, len 2: code_off: 296 (0x000128)
- A8 02
-// parsed: offset 511, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 512, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 516, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 528, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 10
- // offset: 112 (0x000070)
- 01 00 00 00 0A 00 00 00 70 00 00 00
- // parsed: offset 540, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 152 (0x000098)
- 02 00 00 00 05 00 00 00 98 00 00 00
- // parsed: offset 552, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 172 (0x0000ac)
- 03 00 00 00 03 00 00 00 AC 00 00 00
- // parsed: offset 564, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 208 (0x0000d0)
- 05 00 00 00 04 00 00 00 D0 00 00 00
- // parsed: offset 576, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 240 (0x0000f0)
- 06 00 00 00 01 00 00 00 F0 00 00 00
- // parsed: offset 588, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 272 (0x000110)
- 01 20 00 00 02 00 00 00 10 01 00 00
- // parsed: offset 600, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 328 (0x000148)
- 01 10 00 00 01 00 00 00 48 01 00 00
- // parsed: offset 612, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 10
- // offset: 334 (0x00014e)
- 02 20 00 00 0A 00 00 00 4E 01 00 00
- // parsed: offset 624, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 497 (0x0001f1)
- 00 20 00 00 01 00 00 00 F1 01 00 00
- // parsed: offset 636, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 512 (0x000200)
- 00 10 00 00 01 00 00 00 00 02 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.d
deleted file mode 100644
index c07542c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.d
+++ /dev/null
@@ -1,75 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_4.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_4
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private static test(IIIIIIIIII)I
-.limit regs 11
- const v0, 10
- if-ne v0, v10, Label0
- const v0, 9
- if-ne v0, v9, Label0
- const v0, 8
- if-ne v0, v8, Label0
- const v0, 7
- if-ne v0, v7, Label0
- const v0, 6
- if-ne v0, v6, Label0
- const v0, 5
- if-ne v0, v5, Label0
- const v0, 4
- if-ne v0, v4, Label0
- const v0, 3
- if-ne v0, v3, Label0
- const v0, 2
- if-ne v0, v2, Label0
- const v0, 1
- if-ne v0, v1, Label0
-
- const v0, 1
- return v0
-Label0:
- const v0, 0
- return v0
-
-.end method
-
-.method public static run()I
-.limit regs 16
- const v1, 1
- const v2, 2
- const v3, 3
- const v4, 4
- const v5, 5
- const v6, 6
- const v7, 7
- const v8, 8
- const v9, 9
- const v10, 10
-
- invoke-static/range {v1..v10}, dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_4/test(IIIIIIIIII)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.java
deleted file mode 100644
index 9f91e19..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_4 {
-
-
- public static int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.d
deleted file mode 100644
index 14cbfd6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_5.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const/4 v2, 5
- invoke-static/range {v2}, dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5/test(I)I
- move-result v0
- return v0
-.end method
-
-.method public test(I)I
-.limit regs 5
-
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.java
deleted file mode 100644
index 3e1f9cb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_5 {
- public int run() {
- return 0;
- }
- public int test(int i) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6.d
deleted file mode 100644
index a739336..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_6.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static native test()V
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6.java
deleted file mode 100644
index ab00d04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_6.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_6 {
-
- public static native void test();
-
- public void run() {
- test();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.d
deleted file mode 100644
index a7615ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_7.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static test()V
-.limit regs 0
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
-
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7/testN()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.java
deleted file mode 100644
index 5e81cca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_7 {
- public static void test() {
- }
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.d
deleted file mode 100644
index a494912..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_static_range_8.java
-.class public dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
- invoke-static/range {}, dot/junit/opcodes/invoke_static_range/TestClass/testPvt()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.java
deleted file mode 100644
index ac8e6c3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_static_range.d;
-
-public class T_invoke_static_range_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/ATest.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/ATest.java
deleted file mode 100644
index af69eaf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/ATest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super;
-
-public abstract class ATest {
-
- public abstract void test();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/TestStubs.java
deleted file mode 100644
index 28fc156..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/TestStubs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super;
-
-public class TestStubs {
- @SuppressWarnings("unused")
- private void TestStub() {
- // used by testE6
- }
-
- protected void TestStubP() {
- // used by testE7
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
deleted file mode 100644
index 6efac8b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_1;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_10;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_14;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_15;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_17;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_18;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_19;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_2;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_20;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_4;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_5;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_6;
-import dot.junit.opcodes.invoke_super.d.T_invoke_super_7;
-
-public class Test_invoke_super extends DxTestCase {
-
- /**
- * @title invoke method of superclass
- */
- public void testN1() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_1
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- T_invoke_super_1 t = new T_invoke_super_1();
- assertEquals(5, t.run());
- }
-
-
- /**
- * @title Invoke protected method of superclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_7
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- T_invoke_super_7 t = new T_invoke_super_7();
- assertEquals(5, t.run());
- }
-
- /**
- * @title Check that new frame is created by invoke_super and
- * arguments are passed to method
- */
- public void testN5() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_14
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- T_invoke_super_14 t = new T_invoke_super_14();
- assertTrue(t.run());
- }
-
- /**
- * @title Recursion of method lookup procedure
- */
- public void testN6() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_17
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- //@uses dot.junit.opcodes.invoke_super.d.TSuper2
- T_invoke_super_17 t = new T_invoke_super_17();
- assertEquals(5, t.run());
- }
-
- /**
- * @title obj ref is null
- */
- public void testE1() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_1
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- T_invoke_super_2 t = new T_invoke_super_2();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE2() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_4
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- T_invoke_super_4 t = new T_invoke_super_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
- }
-
- /**
- * @title Attempt to invoke abstract method
- */
- public void testE4() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_6
- //@uses dot.junit.opcodes.invoke_super.ATest
- T_invoke_super_6 t = new T_invoke_super_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
- }
-
- /**
- * @constraint A13
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <clinit> may not be called using invoke-super
- */
- public void testVFE3() {
- try {
- new T_invoke_super_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments passed to method
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method.
- */
- public void testVFE5() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_12
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <init> may not be called using invoke_super
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * protected method
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_22
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- //@uses dot.junit.opcodes.invoke_super.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * public method
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_23
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- //@uses dot.junit.opcodes.invoke_super.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call static method.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_5
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- new T_invoke_super_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke non-existing method.
- */
- public void testVFE12() {
- try {
- new T_invoke_super_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to invoke private method of other class.
- */
- public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_18
- //@uses dot.junit.opcodes.invoke_super.TestStubs
- try {
- new T_invoke_super_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to invoke protected method of unrelated class.
- */
- public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_20
- //@uses dot.junit.opcodes.invoke_super.TestStubs
- try {
- new T_invoke_super_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_19
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- new T_invoke_super_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title invoke-super shall be used to invoke private methods
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_13
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A13
- * @title attempt to invoke interface method
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_25
- //@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TPlain.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TPlain.d
deleted file mode 100644
index 5eaf417..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TPlain.d
+++ /dev/null
@@ -1,31 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TPlain.java
-.class public dot.junit.opcodes.invoke_super.d.TPlain
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper.d
deleted file mode 100644
index c7993b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper.java
-.class public dot.junit.opcodes.invoke_super.d.TSuper
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public toInt(F)I
-.limit regs 3
- int-to-float v0, v2
- return v0
-.end method
-
-.method public native toIntNative()I
-.end method
-
-.method public static toIntStatic()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method protected toIntP()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method private toIntPvt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public testArgsOrder(II)I
-.limit regs 4
- const v0, 349
- const v1, 344656
- div-int v2, v2, v3
- return v2
-.end method
-
-.method public testString(Ljava/lang/String;)V
-.limit regs 2
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper.java
deleted file mode 100644
index 7767485..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class TSuper {
-
- public int toInt() {
- return 0;
- }
-
- public int toInt(float f) {
- return 0;
- }
-
- public native int toIntNative();
-
- public static int toIntStatic() {
- return 0;
- }
-
- protected int toIntP() {
- return 0;
- }
-
- private int toIntPvt() {
- return 0;
- }
-
- public int testArgsOrder(int arg1, int arg2) {
- return 0;
- }
-
- public void testString(String s) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper2.d
deleted file mode 100644
index b74842f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/TSuper2.d
+++ /dev/null
@@ -1,30 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper2.java
-.class public dot.junit.opcodes.invoke_super.d.TSuper2
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public test()I
-.limit regs 3
- const v0, 123
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.d
deleted file mode 100644
index 829c67f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_1.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_1
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 8
-
- invoke-super {v7}, dot/junit/opcodes/invoke_super/d/T_invoke_super_1/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 777
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.java
deleted file mode 100644
index 2c1f61d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_1{
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.d
deleted file mode 100644
index bc38f2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_10.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_10
-.super java/lang/Object
-
-.method static <clinit>()V
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
- invoke-super {v0}, dot.junit.opcodes.invoke_super.d.T_invoke_super_10/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.java
deleted file mode 100644
index 76fff9d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_10 {
-
- public void run() {
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_11.d
deleted file mode 100644
index 97683ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_11.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_11.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-super {v6}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_12.d
deleted file mode 100644
index 0b6efa2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_12.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_12
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 8
-
- invoke-super {v5, v5}, dot.junit.opcodes.invoke_super.d.T_invoke_super_12/testString(Ljava/lang/String;)V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_13.d
deleted file mode 100644
index a030b72..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_13.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_13.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_13
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method private toIntPvt()I
-.limit regs 3
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/T_invoke_super_13/toIntPvt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.d
deleted file mode 100644
index b70f691..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.d
+++ /dev/null
@@ -1,61 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_14.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_14
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 7
-
- const v1, 123
- const v2, 659
-
- const v3, 300
- const v4, 3
-
- invoke-super {v6, v3, v4}, dot/junit/opcodes/invoke_super/d/T_invoke_super_14/testArgsOrder(II)I
-
- move-result v3
- const v4, 100
- if-ne v3, v4, Label0
-
- const v4, 123
- if-ne v1, v4, Label0
-
- const v4, 659
- if-ne v2, v4, Label0
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-.method public testArgsOrder(II)I
-.limit regs 4
- const v0, 0
- return v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.java
deleted file mode 100644
index 7dfcf14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-
-public class T_invoke_super_14{
-
- public boolean run() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.d
deleted file mode 100644
index 32c2700..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_15.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/T_invoke_super_15/testN()V
- return-void
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.java
deleted file mode 100644
index f3e30f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_16.d
deleted file mode 100644
index 92f6c2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_16.d
+++ /dev/null
@@ -1,26 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_16.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
- invoke-super {v2}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.d
deleted file mode 100644
index de24bf3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_17.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_17
-.super dot/junit/opcodes/invoke_super/d/TSuper2
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper2/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/T_invoke_super_17/toInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.java
deleted file mode 100644
index cb68374..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-
-public class T_invoke_super_17 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.d
deleted file mode 100644
index e3d61e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_18.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_super/TestStubs;)V
-.limit regs 5
-
- invoke-super {v4}, dot/junit/opcodes/invoke_super/TestStubs/TestStub()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.java
deleted file mode 100644
index 9c256a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-import dot.junit.opcodes.invoke_super.TestStubs;
-
-public class T_invoke_super_18 {
- public void run(TestStubs stubs) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.d
deleted file mode 100644
index 847e743..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_19.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_19
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const/4 v2, 1
- invoke-super {v3, v2}, dot/junit/opcodes/invoke_super/d/T_invoke_super_19/toInt(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.java
deleted file mode 100644
index 15256e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_19 extends TSuper {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.d
deleted file mode 100644
index 0144130..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_2.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_2
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 8
- const v7, 0
- invoke-super {v7}, dot/junit/opcodes/invoke_super/d/T_invoke_super_2/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 777
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.java
deleted file mode 100644
index 474115a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_2{
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.d
deleted file mode 100644
index eb429ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_20.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_20
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_super/TestStubs;)V
-.limit regs 5
-
- invoke-super {v4}, dot/junit/opcodes/invoke_super/TestStubs/TestStubP()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.java
deleted file mode 100644
index 2ae592e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-import dot.junit.opcodes.invoke_super.TestStubs;
-
-public class T_invoke_super_20 {
- public void run(TestStubs stubs) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_22.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_22.d
deleted file mode 100644
index fbeb8e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_22.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_22.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_22
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_super/d/TPlain
- invoke-direct {v2}, dot/junit/opcodes/invoke_super/d/TPlain/<init>()V
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/TSuper/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_23.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_23.d
deleted file mode 100644
index f1d2a6f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_23.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_23.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_23
-.super dot/junit/opcodes/invoke_super/d/TSuper2
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper2/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_super/d/TSuper
- invoke-direct {v2}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/TSuper2/test()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.d
deleted file mode 100644
index 55303d3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.d
+++ /dev/null
@@ -1,58 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_super.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-; =====================================
-
-.source TTestInterfaceImpl.java
-.class public dot.junit.opcodes.invoke_super.d.TTestInterfaceImpl
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_super.d.TTestInterface
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-; =====================================
-
-.source T_invoke_super_24.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_24
-.super dot/junit/opcodes/invoke_super/d/TTestInterfaceImpl
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TTestInterfaceImpl/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-super {v7}, dot/junit/opcodes/invoke_super/d/TTestInterface/test()V
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_25.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_25.d
deleted file mode 100644
index f6e763c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_25.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_25.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_25
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 4
-
- new-instance v3, dot/junit/opcodes/invoke_super/d/T_invoke_super_25
- invoke-super {v3}, dot/junit/opcodes/invoke_super/d/T_invoke_super_25/toInt()I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.d
deleted file mode 100644
index 3f80ff8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_4.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_4
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/T_invoke_super_4/toIntNative()I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.java
deleted file mode 100644
index 316909f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_4 {
-
- public native void test();
-
- public void run() {
- test();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.d
deleted file mode 100644
index af16744..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_5.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_5
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 3
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/TSuper/toIntStatic()I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.java
deleted file mode 100644
index c633829..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-public class T_invoke_super_5 extends TSuper {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.d
deleted file mode 100644
index 94361b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_6.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_6
-.super dot/junit/opcodes/invoke_super/ATest
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/ATest/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/ATest/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.java
deleted file mode 100644
index 47cf76f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-import dot.junit.opcodes.invoke_super.ATest;
-
-public class T_invoke_super_6 extends ATest {
-
- public void test(){
- int i = 2+5;
- }
-
- public void run() {
- test();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.d
deleted file mode 100644
index a62a1e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_7.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_7
-.super dot/junit/opcodes/invoke_super/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-super {v2}, dot/junit/opcodes/invoke_super/d/T_invoke_super_7/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.java
deleted file mode 100644
index 2f45567..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super.d;
-
-
-public class T_invoke_super_7 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.d
deleted file mode 100644
index 48e9bdd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_8.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-super {v6, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.dfh
deleted file mode 100644
index 8501c68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : e6b95367
- 67 53 B9 E6
-// parsed: offset 12, len 20: signature : 1f59...4982
- 1F 59 10 CB D9 05 57 DD FD 89 AE 82 F3 40 87 4D 92 7E 49 82
-// parsed: offset 32, len 4: file_size : 592
- 50 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 468 (0x0001d4)
- D4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 344
- 58 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 308 (0x000134) "<init>"
- 34 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 316 (0x00013c) "I"
- 3C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 319 (0x00013f) "Ldot/junit/opcodes/invoke_super/d/TSuper;"
- 3F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 362 (0x00016a) "Ldot/junit/opcodes/invoke_super/d/T_invoke_super_8;"
- 6A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 415 (0x00019f) "T_invoke_super_8.java"
- 9F 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 438 (0x0001b6) "V"
- B6 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 441 (0x0001b9) "run"
- B9 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 446 (0x0001be) "toInt"
- BE 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/invoke_super/d/TSuper;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/invoke_super/d/T_invoke_super_8;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "toInt"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-// parsed: offset 208, len 8: [3] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 02 00 00 00 06 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 2 "Ldot/junit/opcodes/invoke_super/d/T_invoke_super_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ldot/junit/opcodes/invoke_super/d/TSuper;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_invoke_super_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 453 (0x0001c5)
-// static_values_off: 0 (0x000000)
- 02 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 C5 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_super.d.T_invoke_super_8.<init>"
- // parsed: offset 248, len 2: registers_size: 3
- 03 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 264, len 2: |0000: move-object v0, v2
- 07 20
- // parsed: offset 266, len 2: |0001: move-object v1, v0
- 07 01
- // parsed: offset 268, len 6: |0002: invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;.<init>:()V // method@0000
- 70 10 00 00 01 00
- // parsed: offset 274, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_super.d.T_invoke_super_8.run"
- // parsed: offset 276, len 2: registers_size: 3
- 03 00
- // parsed: offset 278, len 2: ins_size: 1
- 01 00
- // parsed: offset 280, len 2: outs_size: 1
- 01 00
- // parsed: offset 282, len 2: tries_size: 0
- 00 00
- // parsed: offset 284, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 288, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 292, len 2: |0000: move-object v0, v2
- 07 20
- // parsed: offset 294, len 2: |0001: const/4 v1, #int 0 // #0x0
- 12 01
- // parsed: offset 296, len 6: |0002: invoke-super {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;.toInt:()I // method@0001
-//@mod 6F 10 01 00 01 00
- 6F 10 01 01 01 00
- // parsed: offset 302, len 2: |0005: move-result v1
- 0A 01
- // parsed: offset 304, len 2: |0006: move v0, v1
- 01 10
- // parsed: offset 306, len 2: |0007: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 308, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 316, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 319, len 43: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/invoke_super/d/TSuper;"
- 29 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 2F 64 2F 54 53 75 70 65 72 3B 00
-// parsed: offset 362, len 53: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/invoke_super/d/T_invoke_super_8;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 5F 38 3B 00
-// parsed: offset 415, len 23: TYPE_STRING_DATA_ITEM [4] "T_invoke_super_8.java"
- 15 54 5F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 5F 38 2E 6A 61 76 61 00
-// parsed: offset 438, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 441, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 446, len 7: TYPE_STRING_DATA_ITEM [7] "toInt"
- 05 74 6F 49 6E 74 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_super/d/T_invoke_super_8;"
- // parsed: offset 453, len 1: static_fields_size: 0
- 00
- // parsed: offset 454, len 1: instance_fields_size: 0
- 00
- // parsed: offset 455, len 1: direct_methods_size: 1
- 01
- // parsed: offset 456, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 457, len 1: method_idx_diff: 2 (method_idx: 2 "<init>")
- 02
- // parsed: offset 458, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 461, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 463, len 1: method_idx_diff: 3 (method_idx: 3 "run")
- 03
- // parsed: offset 464, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 465, len 2: code_off: 276 (0x000114)
- 94 02
-// parsed: offset 467, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 468, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 472, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 484, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 496, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 508, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 520, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 184 (0x0000b8)
- 05 00 00 00 04 00 00 00 B8 00 00 00
- // parsed: offset 532, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 544, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 556, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 308 (0x000134)
- 02 20 00 00 08 00 00 00 34 01 00 00
- // parsed: offset 568, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 453 (0x0001c5)
- 00 20 00 00 01 00 00 00 C5 01 00 00
- // parsed: offset 580, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 10 00 00 01 00 00 00 D4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_9.d
deleted file mode 100644
index 79626b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_9.java
-.class public dot.junit.opcodes.invoke_super.d.T_invoke_super_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-super {v8, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/ATest.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/ATest.java
deleted file mode 100644
index 20e9c5e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/ATest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range;
-
-public abstract class ATest {
-
- public abstract void test();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/TestStubs.java
deleted file mode 100644
index 22b5046..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/TestStubs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range;
-
-public class TestStubs {
- @SuppressWarnings("unused")
- private void TestStub() {
- // used by testE6
- }
-
- protected void TestStubP() {
- // used by testE7
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
deleted file mode 100644
index d65b8d4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_1;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_10;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_14;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_15;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_17;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_18;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_19;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_2;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_20;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_4;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_5;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_6;
-import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_7;
-
-public class Test_invoke_super_range extends DxTestCase {
-
- /**
- * @title invoke method of superclass
- */
- public void testN1() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_1
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_1 t = new T_invoke_super_range_1();
- assertEquals(5, t.run());
- }
-
-
- /**
- * @title Invoke protected method of superclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_7
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_7 t = new T_invoke_super_range_7();
- assertEquals(5, t.run());
- }
-
- /**
- * @title Check that new frame is created by invoke_super_range and
- * arguments are passed to method
- */
- public void testN5() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_14
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_14 t = new T_invoke_super_range_14();
- assertTrue(t.run());
- }
-
- /**
- * @title Recursion of method lookup procedure
- */
- public void testN6() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_17
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper2
- T_invoke_super_range_17 t = new T_invoke_super_range_17();
- assertEquals(5, t.run());
- }
-
- /**
- * @title obj ref is null
- */
- public void testE1() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_1
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_2 t = new T_invoke_super_range_2();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE2() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_4
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_4 t = new T_invoke_super_range_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
- }
-
- /**
- * @title Attempt to invoke abstract method
- */
- public void testE4() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_6
- //@uses dot.junit.opcodes.invoke_super_range.ATest
- T_invoke_super_range_6 t = new T_invoke_super_range_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
- }
-
- /**
- * @constraint A14
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <clinit> may not be called using invoke-super
- */
- public void testVFE3() {
- try {
- new T_invoke_super_range_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments passed to method
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method.
- */
- public void testVFE5() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <init> may not be called using invoke_super_range
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * protected method
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_22
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- //@uses dot.junit.opcodes.invoke_super_range.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * public method
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_23
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call static method.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_5
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- new T_invoke_super_range_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke non-existing method.
- */
- public void testVFE12() {
- try {
- new T_invoke_super_range_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to invoke private method of other class.
- */
- public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_18
- //@uses dot.junit.opcodes.invoke_super_range.TestStubs
- try {
- new T_invoke_super_range_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to invoke protected method of unrelated class.
- */
- public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_20
- //@uses dot.junit.opcodes.invoke_super_range.TestStubs
- try {
- new T_invoke_super_range_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_19
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- new T_invoke_super_range_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title invoke-super/range shall be used to invoke private methods
- */
- public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_13
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A14
- * @title attempt to invoke interface method
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_25
- //@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TPlain.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TPlain.d
deleted file mode 100644
index ba9512e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TPlain.d
+++ /dev/null
@@ -1,31 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TPlain.java
-.class public dot.junit.opcodes.invoke_super_range.d.TPlain
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper.d
deleted file mode 100644
index e9d0ff1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper.java
-.class public dot.junit.opcodes.invoke_super_range.d.TSuper
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public toInt(F)I
-.limit regs 3
- int-to-float v0, v2
- return v0
-.end method
-
-.method public native toIntNative()I
-.end method
-
-.method public static toIntStatic()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method protected toIntP()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method private toIntPvt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public testArgsOrder(II)I
-.limit regs 4
- const v0, 349
- const v1, 344656
- div-int v2, v2, v3
- return v2
-.end method
-
-.method public testString(Ljava/lang/String;)V
-.limit regs 2
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper.java
deleted file mode 100644
index 004b573..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class TSuper {
-
- public int toInt() {
- return 0;
- }
-
- public int toInt(float f) {
- return 0;
- }
-
- public native int toIntNative();
-
- public static int toIntStatic() {
- return 0;
- }
-
- protected int toIntP() {
- return 0;
- }
-
- private int toIntPvt() {
- return 0;
- }
-
- public int testArgsOrder(int arg1, int arg2) {
- return 0;
- }
-
- public void testString(String s) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper2.d
deleted file mode 100644
index 90baf5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/TSuper2.d
+++ /dev/null
@@ -1,30 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper2.java
-.class public dot.junit.opcodes.invoke_super_range.d.TSuper2
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public test()I
-.limit regs 3
- const v0, 123
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.d
deleted file mode 100644
index 4181eed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_1.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_1
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 8
-
- invoke-super/range {v7}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 777
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.java
deleted file mode 100644
index 0844d80..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class T_invoke_super_range_1{
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.d
deleted file mode 100644
index baca689..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_10.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_10
-.super java/lang/Object
-
-.method static <clinit>()V
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
- invoke-super/range {v0}, dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_10/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.java
deleted file mode 100644
index 3ff5490..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class T_invoke_super_range_10 {
-
- public void run() {
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11.d
deleted file mode 100644
index 7cc537c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_11.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-super/range {v6}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12.d
deleted file mode 100644
index 38cd7d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_12.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 8
- move-object v4, v5
- invoke-super/range {v4..v5}, dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12/testString(Ljava/lang/String;)V
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13.d
deleted file mode 100644
index d177e76..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_13.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_13
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method private toIntPvt()I
-.limit regs 3
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13/toIntPvt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.d
deleted file mode 100644
index c90b576..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.d
+++ /dev/null
@@ -1,61 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_14.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_14
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 7
-
- const v1, 123
- const v2, 659
-
- const v4, 300
- const v5, 3
- move-object v3, v6
- invoke-super/range {v3..v5}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14/testArgsOrder(II)I
-
- move-result v3
- const v4, 100
- if-ne v3, v4, Label0
-
- const v4, 123
- if-ne v1, v4, Label0
-
- const v4, 659
- if-ne v2, v4, Label0
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-.method public testArgsOrder(II)I
-.limit regs 4
- const v0, 0
- return v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.java
deleted file mode 100644
index 32af085..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-
-public class T_invoke_super_range_14{
-
- public boolean run() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.d
deleted file mode 100644
index 7c57710..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_15.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15/testN()V
- return-void
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.java
deleted file mode 100644
index dfd335a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class T_invoke_super_range_15 extends TSuper {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16.d
deleted file mode 100644
index 90d9a21..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16.d
+++ /dev/null
@@ -1,26 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_16.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
- invoke-super/range {v2}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.d
deleted file mode 100644
index 962adb5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_17.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_17
-.super dot/junit/opcodes/invoke_super_range/d/TSuper2
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper2/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17/toInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.java
deleted file mode 100644
index 5d87c2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-
-public class T_invoke_super_range_17 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.d
deleted file mode 100644
index 709fad6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_18.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_super_range/TestStubs;)V
-.limit regs 5
-
- invoke-super/range {v4}, dot/junit/opcodes/invoke_super_range/TestStubs/TestStub()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.java
deleted file mode 100644
index fec68ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-import dot.junit.opcodes.invoke_super_range.TestStubs;
-
-public class T_invoke_super_range_18 {
- public void run(TestStubs stubs) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19.d
deleted file mode 100644
index d30cc05..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_19.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_19
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- move-object v0, v3
- const/4 v1, 1
- invoke-super/range {v0, v1}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19/toInt(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19.java
deleted file mode 100644
index d359454..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_19.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-
-public class T_invoke_super_range_19 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.d
deleted file mode 100644
index b8c9051..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_2.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_2
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 8
- const v7, 0
- invoke-super/range {v7}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2/toInt()I
-
- move-result v0
- return v0
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 777
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.java
deleted file mode 100644
index c9a5f0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class T_invoke_super_range_2{
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.d
deleted file mode 100644
index 7ea46f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_20.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_20
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_super_range/TestStubs;)V
-.limit regs 5
-
- invoke-super/range {v4}, dot/junit/opcodes/invoke_super_range/TestStubs/TestStubP()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.java
deleted file mode 100644
index 2e9724c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-import dot.junit.opcodes.invoke_super_range.TestStubs;
-
-public class T_invoke_super_range_20 {
- public void run(TestStubs stubs) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22.d
deleted file mode 100644
index efe22e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_22.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_22
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_super_range/d/TPlain
- invoke-direct {v2}, dot/junit/opcodes/invoke_super_range/d/TPlain/<init>()V
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/TSuper/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23.d
deleted file mode 100644
index 5877042..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_23.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_23
-.super dot/junit/opcodes/invoke_super_range/d/TSuper2
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper2/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_super_range/d/TSuper
- invoke-direct {v2}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/TSuper2/test()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_24.d
deleted file mode 100644
index dcc399d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_24.d
+++ /dev/null
@@ -1,58 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_super_range.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-; =====================================
-
-.source TTestInterfaceImpl.java
-.class public dot.junit.opcodes.invoke_super_range.d.TTestInterfaceImpl
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_super_range.d.TTestInterface
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-; =====================================
-
-.source T_invoke_super_range_24.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24
-.super dot/junit/opcodes/invoke_super_range/d/TTestInterfaceImpl
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TTestInterfaceImpl/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- invoke-super/range {v7}, dot/junit/opcodes/invoke_super_range/d/TTestInterface/test()V
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25.d
deleted file mode 100644
index 1a9d17a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_25.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_25
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 4
-
- new-instance v3, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25
- invoke-super/range {v3}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25/toInt()I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.d
deleted file mode 100644
index eb1a1f5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_4.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_4
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4/toIntNative()I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.java
deleted file mode 100644
index d9b6b9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class T_invoke_super_range_4 {
-
- public native void test();
-
- public void run() {
- test();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.d
deleted file mode 100644
index bf38cab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_5.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_5
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 3
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/TSuper/toIntStatic()I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.java
deleted file mode 100644
index aa448e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-public class T_invoke_super_range_5 extends TSuper {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.d
deleted file mode 100644
index bb9161c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_6.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_6
-.super dot/junit/opcodes/invoke_super_range/ATest
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/ATest/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/ATest/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.java
deleted file mode 100644
index 64229eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-import dot.junit.opcodes.invoke_super_range.ATest;
-
-public class T_invoke_super_range_6 extends ATest {
-
- public void test(){
- int i = 2+5;
- }
-
- public void run() {
- test();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.d
deleted file mode 100644
index f170aac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_7.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_7
-.super dot/junit/opcodes/invoke_super_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_super_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-super/range {v2}, dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.java
deleted file mode 100644
index d09e351..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_super_range.d;
-
-
-public class T_invoke_super_range_7 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.d
deleted file mode 100644
index ed4d3ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_8.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-super/range {v6..v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.dfh
deleted file mode 100644
index 3b8efa1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.dfh
+++ /dev/null
@@ -1,288 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 677c55cc
- CC 55 7C 67
-// parsed: offset 12, len 20: signature : c17c...13a7
- C1 7C 21 3E 4F CA 1A 28 AD C6 6A 29 3E DE 7A A7 DC B7 13 A7
-// parsed: offset 32, len 4: file_size : 636
- 7C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 500 (0x0001f4)
- F4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 10
- 0A 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 236 (0x0000ec)
- EC 00 00 00
-// parsed: offset 104, len 4: data_size : 368
- 70 01 00 00
-// parsed: offset 108, len 4: data_off : 268 (0x00010c)
- 0C 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 336 (0x000150) "<init>"
- 50 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 344 (0x000158) "Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8;"
- 58 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 409 (0x000199) "Ljava/lang/Object;"
- 99 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 429 (0x0001ad) "T_invoke_super_range_8.java"
- AD 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 458 (0x0001ca) "V"
- CA 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 461 (0x0001cd) "Z"
- CD 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 464 (0x0001d0) "ZL"
- D0 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 468 (0x0001d4) "ZLL"
- D4 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 473 (0x0001d9) "equals"
- D9 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 481 (0x0001e1) "run"
- E1 01 00 00
-
-// type_ids:
-// parsed: offset 152, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8;"
- 01 00 00 00
-// parsed: offset 156, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 160, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 164, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 6 (0x000006) "ZL"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 320 (0x000140)
- 06 00 00 00 03 00 00 00 40 01 00 00
-// parsed: offset 192, len 12: [2]
-// shorty_idx: 7 (0x000007) "ZLL"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 328 (0x000148)
- 07 00 00 00 03 00 00 00 48 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 204, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 212, len 8: [1] class_idx: 0 (0x000000) proto_idx: 2 (0x000002) name_idx: 9 (0x000009) "run"
- 00 00 02 00 09 00 00 00
-// parsed: offset 220, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 228, len 8: [3] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "equals"
- 01 00 01 00 08 00 00 00
-
-// class_defs:
-// parsed: offset 236, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_invoke_super_range_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 486 (0x0001e6)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 E6 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_8.<init>"
- // parsed: offset 268, len 2: registers_size: 2
- 02 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 1
- 01 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 284, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 01 00
- // parsed: offset 290, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_8.run"
- // parsed: offset 292, len 2: registers_size: 8
- 08 00
- // parsed: offset 294, len 2: ins_size: 3
- 03 00
- // parsed: offset 296, len 2: outs_size: 2
- 02 00
- // parsed: offset 298, len 2: tries_size: 0
- 00 00
- // parsed: offset 300, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 304, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 308, len 6: |0000: invoke-super/range {v6..v7}, Ljava/lang/Object;.equals:(Ljava/lang/Object;)Z // method@0003
-//@mod 75 02 03 00 06 00
- 75 02 03 01 06 00
- // parsed: offset 314, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 316, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 318, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 320, len 4: size: 1
- 01 00 00 00
- // parsed: offset 324, len 2: type_item [0] type_idx: 1
- 01 00
-// parsed: offset 326, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 2
- 02 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 1
- 01 00
- // parsed: offset 334, len 2: type_item [1] type_idx: 1
- 01 00
-// parsed: offset 336, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 344, len 65: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8;"
- 3F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 5F 72 61 6E 67 65 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 5F 72 61 6E 67 65 5F 38 3B 00
-// parsed: offset 409, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 429, len 29: TYPE_STRING_DATA_ITEM [3] "T_invoke_super_range_8.java"
- 1B 54 5F 69 6E 76 6F 6B 65 5F 73 75 70 65 72 5F 72 61 6E 67 65 5F 38 2E 6A 61 76 61 00
-// parsed: offset 458, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 461, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 464, len 4: TYPE_STRING_DATA_ITEM [6] "ZL"
- 02 5A 4C 00
-// parsed: offset 468, len 5: TYPE_STRING_DATA_ITEM [7] "ZLL"
- 03 5A 4C 4C 00
-// parsed: offset 473, len 8: TYPE_STRING_DATA_ITEM [8] "equals"
- 06 65 71 75 61 6C 73 00
-// parsed: offset 481, len 5: TYPE_STRING_DATA_ITEM [9] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8;"
- // parsed: offset 486, len 1: static_fields_size: 0
- 00
- // parsed: offset 487, len 1: instance_fields_size: 0
- 00
- // parsed: offset 488, len 1: direct_methods_size: 1
- 01
- // parsed: offset 489, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 490, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 491, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 494, len 2: code_off: 268 (0x00010c)
- 8C 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 496, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 497, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 498, len 2: code_off: 292 (0x000124)
- A4 02
-// map_list:
- // parsed: offset 500, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 504, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 516, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 10
- // offset: 112 (0x000070)
- 01 00 00 00 0A 00 00 00 70 00 00 00
- // parsed: offset 528, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 152 (0x000098)
- 02 00 00 00 04 00 00 00 98 00 00 00
- // parsed: offset 540, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 168 (0x0000a8)
- 03 00 00 00 03 00 00 00 A8 00 00 00
- // parsed: offset 552, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 204 (0x0000cc)
- 05 00 00 00 04 00 00 00 CC 00 00 00
- // parsed: offset 564, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 236 (0x0000ec)
- 06 00 00 00 01 00 00 00 EC 00 00 00
- // parsed: offset 576, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 268 (0x00010c)
- 01 20 00 00 02 00 00 00 0C 01 00 00
- // parsed: offset 588, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 2
- // offset: 320 (0x000140)
- 01 10 00 00 02 00 00 00 40 01 00 00
- // parsed: offset 600, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 10
- // offset: 336 (0x000150)
- 02 20 00 00 0A 00 00 00 50 01 00 00
- // parsed: offset 612, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 486 (0x0001e6)
- 00 20 00 00 01 00 00 00 E6 01 00 00
- // parsed: offset 624, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 500 (0x0001f4)
- 00 10 00 00 01 00 00 00 F4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9.d
deleted file mode 100644
index e97d513..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_super_range_9.java
-.class public dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-super/range {v7..v8}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/ATest.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/ATest.java
deleted file mode 100644
index f102992..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/ATest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual;
-
-public abstract class ATest {
-
- public abstract void test();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/TestStubs.java
deleted file mode 100644
index e495f54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/TestStubs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual;
-
-public class TestStubs {
- @SuppressWarnings("unused")
- private void TestStub() {
- // used by testE6
- }
-
- protected void TestStubP() {
- // used by testE7
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
deleted file mode 100644
index 6e41ec1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_1;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_10;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_14;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_15;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_17;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_18;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_19;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_20;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_4;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_5;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_6;
-import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_7;
-
-public class Test_invoke_virtual extends DxTestCase {
-
- /**
- * @title invoke virtual method
- */
- public void testN1() {
- T_invoke_virtual_1 t = new T_invoke_virtual_1();
- int a = 1;
- String sa = "a" + a;
- String sb = "a1";
- assertTrue(t.run(sa, sb));
- assertFalse(t.run(t, sa));
- assertFalse(t.run(sb, t));
- }
-
- /**
- * @title Invoke protected method of superclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_7
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- T_invoke_virtual_7 t = new T_invoke_virtual_7();
- assertEquals(5, t.run());
- }
-
- /**
- * @title Check that new frame is created by invoke_virtual and
- * arguments are passed to method
- */
- public void testN5() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_14
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- T_invoke_virtual_14 t = new T_invoke_virtual_14();
- assertTrue(t.run());
- }
-
- /**
- * @title Recursion of method lookup procedure
- */
- public void testN6() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_17
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- T_invoke_virtual_17 t = new T_invoke_virtual_17();
- assertEquals(5, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE1() {
- T_invoke_virtual_1 t = new T_invoke_virtual_1();
- String s = "s";
- try {
- t.run(null, s);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE2() {
- T_invoke_virtual_4 t = new T_invoke_virtual_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
- }
-
- /**
- * @title Attempt to invoke abstract method
- */
- public void testE4() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_6
- //@uses dot.junit.opcodes.invoke_virtual.ATest
- T_invoke_virtual_6 t = new T_invoke_virtual_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
- }
-
- /**
- * @constraint A13
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <clinit> may not be called using invoke-virtual
- */
- public void testVFE3() {
- try {
- new T_invoke_virtual_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments passed to method
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <init> may not be called using invoke_virtual
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * protected method
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_22
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- //@uses dot.junit.opcodes.invoke_virtual.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * public method
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_23
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to call static method.
- */
- public void testVFE10() {
- try {
- new T_invoke_virtual_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke non-existing method.
- */
- public void testVFE12() {
- try {
- new T_invoke_virtual_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to invoke private method of other class.
- */
- public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_18
- //@uses dot.junit.opcodes.invoke_virtual.TestStubs
- try {
- new T_invoke_virtual_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to invoke protected method of unrelated class.
- */
- public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_20
- //@uses dot.junit.opcodes.invoke_virtual.TestStubs
- try {
- new T_invoke_virtual_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_19
- //@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- try {
- new T_invoke_virtual_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title invoke-virtual shall be used to invoke private methods
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A13
- * @title attempt to invoke interface method
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE19() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TPlain.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TPlain.d
deleted file mode 100644
index f0328ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TPlain.d
+++ /dev/null
@@ -1,31 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TPlain.java
-.class public dot.junit.opcodes.invoke_virtual.d.TPlain
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper.d
deleted file mode 100644
index 3b7a591..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper.d
+++ /dev/null
@@ -1,67 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper.java
-.class public dot.junit.opcodes.invoke_virtual.d.TSuper
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public toInt(F)I
-.limit regs 3
- int-to-float v0, v2
- return v0
-.end method
-
-.method public native toIntNative()I
-.end method
-
-.method public static toIntStatic()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method protected toIntP()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method private toIntPvt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public testArgsOrder(II)I
-.limit regs 4
- const v0, 349
- const v1, 344656
- div-int v2, v2, v3
- return v2
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper.java
deleted file mode 100644
index eb0b27a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class TSuper {
-
- public int toInt() {
- return 0;
- }
-
- public int toInt(float value) {
- return 0;
- }
-
- public native int toIntNative();
-
- public static int toIntStatic() {
- return 0;
- }
-
- protected int toIntP() {
- return 0;
- }
-
- private int toIntPvt() {
- return 0;
- }
-
- public int testArgsOrder(int arg1, int arg2) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper2.d
deleted file mode 100644
index 2137c4c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/TSuper2.d
+++ /dev/null
@@ -1,30 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper2.java
-.class public dot.junit.opcodes.invoke_virtual.d.TSuper2
-.super dot/junit/opcodes/invoke_virtual/d/TSuper
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public test()I
-.limit regs 3
- const v0, 123
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.d
deleted file mode 100644
index 3192c0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_1.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual {v6, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.java
deleted file mode 100644
index f242600..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class T_invoke_virtual_1 {
-
- public boolean run(Object x, Object y) {
- return x.equals(y);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.d
deleted file mode 100644
index 2c5c909..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_10.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_10
-.super java/lang/Object
-
-.method static <clinit>()V
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
- invoke-virtual {v0}, dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_10/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.java
deleted file mode 100644
index 24898f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class T_invoke_virtual_10 {
-
- public void run() {
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11.d
deleted file mode 100644
index 68ca8c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_11.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual {v6}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12.d
deleted file mode 100644
index 02d509a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_12.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test(Ljava/lang/String;)V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual {v5, v7}, dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_12/test(Ljava/lang/String;)V
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13.d
deleted file mode 100644
index dcf28f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_13.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.d
deleted file mode 100644
index 743ddf4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.d
+++ /dev/null
@@ -1,56 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_14.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_14
-.super dot/junit/opcodes/invoke_virtual/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 7
-
- const v1, 123
- const v2, 659
-
- const v3, 300
- const v4, 3
-
- invoke-virtual {v6, v3, v4}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14/testArgsOrder(II)I
-
- move-result v3
- const v4, 100
- if-ne v3, v4, Label0
-
- const v4, 123
- if-ne v1, v4, Label0
-
- const v4, 659
- if-ne v2, v4, Label0
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.java
deleted file mode 100644
index d0a8d40..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-
-public class T_invoke_virtual_14{
-
- public boolean run() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.d
deleted file mode 100644
index ad196c9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_15.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15/testN()V
- return-void
-.end method
-
-.method public test()V
-.limit regs 1
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.java
deleted file mode 100644
index a3d1b68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class T_invoke_virtual_15 {
- public void run() {
- }
- public void test() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16.d
deleted file mode 100644
index 0f0ab56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16.d
+++ /dev/null
@@ -1,26 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_16.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
- invoke-virtual {v2}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.d
deleted file mode 100644
index da55ec7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_17.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_17
-.super dot/junit/opcodes/invoke_virtual/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17/toInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.java
deleted file mode 100644
index 918e3b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-
-public class T_invoke_virtual_17 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.d
deleted file mode 100644
index 32097da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_18.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_virtual/TestStubs;)V
-.limit regs 5
- invoke-virtual {v4}, dot/junit/opcodes/invoke_virtual/TestStubs/TestStub()V
-Label6:
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.java
deleted file mode 100644
index c6b0c6f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-import dot.junit.opcodes.invoke_virtual.TestStubs;
-
-public class T_invoke_virtual_18 {
- public void run(TestStubs stub) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.d
deleted file mode 100644
index ce0b550..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_19.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_19
-.super dot/junit/opcodes/invoke_virtual/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const/4 v2, 1
- invoke-virtual {v3, v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19/toInt(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.java
deleted file mode 100644
index 36e3515..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class T_invoke_virtual_19 extends TSuper {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.d
deleted file mode 100644
index f655091..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_20.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_20
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_virtual/TestStubs;)V
-.limit regs 5
-Label0:
-
- invoke-virtual {v4}, dot/junit/opcodes/invoke_virtual/TestStubs/TestStubP()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.java
deleted file mode 100644
index 0954ddb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-import dot.junit.opcodes.invoke_virtual.TestStubs;
-
-public class T_invoke_virtual_20 {
- public void run(TestStubs stub) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22.d
deleted file mode 100644
index 135f037..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_22.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_22
-.super dot/junit/opcodes/invoke_virtual/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_virtual/d/TPlain
- invoke-direct {v2}, dot/junit/opcodes/invoke_virtual/d/TPlain/<init>()V
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/TSuper/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23.d
deleted file mode 100644
index 071a91f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_23.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_23
-.super dot/junit/opcodes/invoke_virtual/d/TSuper2
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper2/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_virtual/d/TSuper
- invoke-direct {v2}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/TSuper2/test()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_24.d
deleted file mode 100644
index 1804cce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_24.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_virtual.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-.source T_invoke_virtual_24.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_virtual.d.TTestInterface
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- invoke-virtual {v3}, dot/junit/opcodes/invoke_virtual/d/TTestInterface/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25.d
deleted file mode 100644
index 7816b12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_25.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_25
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- new-instance v6, java/lang/Object
- invoke-virtual {v6, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4.d
deleted file mode 100644
index 5de2f49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_4.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4/test()V
- return-void
-.end method
-
-.method public native test()V
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4.java
deleted file mode 100644
index 40cc1fa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class T_invoke_virtual_4 {
-
- public native void test();
-
- public void run() {
- test();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.d
deleted file mode 100644
index 6f18698..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_5.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static test()V
-.limit regs 0
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.java
deleted file mode 100644
index a2e32f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-public class T_invoke_virtual_5 {
- public static void test() {
- }
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.d
deleted file mode 100644
index a3f42ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_6.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_6
-.super dot/junit/opcodes/invoke_virtual/ATest
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/ATest/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/ATest/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.java
deleted file mode 100644
index fd8e058..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-import dot.junit.opcodes.invoke_virtual.ATest;
-
-public class T_invoke_virtual_6 extends ATest {
-
- public void test(){
- int i = 2+5;
- }
-
- public void run() {
- test();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.d
deleted file mode 100644
index 2e3a6a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_7.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_7
-.super dot/junit/opcodes/invoke_virtual/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-virtual {v2}, dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.java
deleted file mode 100644
index 27b16ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual.d;
-
-
-public class T_invoke_virtual_7 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.d
deleted file mode 100644
index c6ef760..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_8.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual {v6, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.dfh
deleted file mode 100644
index a556dba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.dfh
+++ /dev/null
@@ -1,288 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a8d05097
- 97 50 D0 A8
-// parsed: offset 12, len 20: signature : 6f6c...0043
- 6F 6C D4 68 F7 7B 24 4C 91 C7 92 D9 30 AA 0C 5B EB 08 00 43
-// parsed: offset 32, len 4: file_size : 624
- 70 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 488 (0x0001e8)
- E8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 10
- 0A 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 236 (0x0000ec)
- EC 00 00 00
-// parsed: offset 104, len 4: data_size : 356
- 64 01 00 00
-// parsed: offset 108, len 4: data_off : 268 (0x00010c)
- 0C 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 336 (0x000150) "<init>"
- 50 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 344 (0x000158) "Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8;"
- 58 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 401 (0x000191) "Ljava/lang/Object;"
- 91 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 421 (0x0001a5) "T_invoke_virtual_8.java"
- A5 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 446 (0x0001be) "V"
- BE 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 449 (0x0001c1) "Z"
- C1 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 452 (0x0001c4) "ZL"
- C4 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 456 (0x0001c8) "ZLL"
- C8 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 461 (0x0001cd) "equals"
- CD 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 469 (0x0001d5) "run"
- D5 01 00 00
-
-// type_ids:
-// parsed: offset 152, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8;"
- 01 00 00 00
-// parsed: offset 156, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 160, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 164, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 6 (0x000006) "ZL"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 320 (0x000140)
- 06 00 00 00 03 00 00 00 40 01 00 00
-// parsed: offset 192, len 12: [2]
-// shorty_idx: 7 (0x000007) "ZLL"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 328 (0x000148)
- 07 00 00 00 03 00 00 00 48 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 204, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 212, len 8: [1] class_idx: 0 (0x000000) proto_idx: 2 (0x000002) name_idx: 9 (0x000009) "run"
- 00 00 02 00 09 00 00 00
-// parsed: offset 220, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 228, len 8: [3] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "equals"
- 01 00 01 00 08 00 00 00
-
-// class_defs:
-// parsed: offset 236, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_invoke_virtual_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 474 (0x0001da)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 DA 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_8.<init>"
- // parsed: offset 268, len 2: registers_size: 2
- 02 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 1
- 01 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 284, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 01 00
- // parsed: offset 290, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_8.run"
- // parsed: offset 292, len 2: registers_size: 8
- 08 00
- // parsed: offset 294, len 2: ins_size: 3
- 03 00
- // parsed: offset 296, len 2: outs_size: 2
- 02 00
- // parsed: offset 298, len 2: tries_size: 0
- 00 00
- // parsed: offset 300, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 304, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 308, len 6: |0000: invoke-virtual {v6, v7}, Ljava/lang/Object;.equals:(Ljava/lang/Object;)Z // method@0003
-//@mod 6E 20 03 00 76 00
- 6E 20 03 01 76 00
- // parsed: offset 314, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 316, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 318, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 320, len 4: size: 1
- 01 00 00 00
- // parsed: offset 324, len 2: type_item [0] type_idx: 1
- 01 00
-// parsed: offset 326, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 2
- 02 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 1
- 01 00
- // parsed: offset 334, len 2: type_item [1] type_idx: 1
- 01 00
-// parsed: offset 336, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 344, len 57: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8;"
- 37 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 76 69 72 74 75 61 6C 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 76 69 72 74 75 61 6C 5F 38 3B 00
-// parsed: offset 401, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 421, len 25: TYPE_STRING_DATA_ITEM [3] "T_invoke_virtual_8.java"
- 17 54 5F 69 6E 76 6F 6B 65 5F 76 69 72 74 75 61 6C 5F 38 2E 6A 61 76 61 00
-// parsed: offset 446, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 449, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 452, len 4: TYPE_STRING_DATA_ITEM [6] "ZL"
- 02 5A 4C 00
-// parsed: offset 456, len 5: TYPE_STRING_DATA_ITEM [7] "ZLL"
- 03 5A 4C 4C 00
-// parsed: offset 461, len 8: TYPE_STRING_DATA_ITEM [8] "equals"
- 06 65 71 75 61 6C 73 00
-// parsed: offset 469, len 5: TYPE_STRING_DATA_ITEM [9] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8;"
- // parsed: offset 474, len 1: static_fields_size: 0
- 00
- // parsed: offset 475, len 1: instance_fields_size: 0
- 00
- // parsed: offset 476, len 1: direct_methods_size: 1
- 01
- // parsed: offset 477, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 478, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 479, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 482, len 2: code_off: 268 (0x00010c)
- 8C 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 484, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 485, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 486, len 2: code_off: 292 (0x000124)
- A4 02
-// map_list:
- // parsed: offset 488, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 492, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 504, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 10
- // offset: 112 (0x000070)
- 01 00 00 00 0A 00 00 00 70 00 00 00
- // parsed: offset 516, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 152 (0x000098)
- 02 00 00 00 04 00 00 00 98 00 00 00
- // parsed: offset 528, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 168 (0x0000a8)
- 03 00 00 00 03 00 00 00 A8 00 00 00
- // parsed: offset 540, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 204 (0x0000cc)
- 05 00 00 00 04 00 00 00 CC 00 00 00
- // parsed: offset 552, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 236 (0x0000ec)
- 06 00 00 00 01 00 00 00 EC 00 00 00
- // parsed: offset 564, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 268 (0x00010c)
- 01 20 00 00 02 00 00 00 0C 01 00 00
- // parsed: offset 576, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 2
- // offset: 320 (0x000140)
- 01 10 00 00 02 00 00 00 40 01 00 00
- // parsed: offset 588, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 10
- // offset: 336 (0x000150)
- 02 20 00 00 0A 00 00 00 50 01 00 00
- // parsed: offset 600, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 474 (0x0001da)
- 00 20 00 00 01 00 00 00 DA 01 00 00
- // parsed: offset 612, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 488 (0x0001e8)
- 00 10 00 00 01 00 00 00 E8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9.d
deleted file mode 100644
index f695913..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_9.java
-.class public dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual {v8, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/ATest.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/ATest.java
deleted file mode 100644
index e6ebd5a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/ATest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range;
-
-public abstract class ATest {
-
- public abstract void test();
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/TestStubs.java
deleted file mode 100644
index d00c43e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/TestStubs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range;
-
-public class TestStubs {
- @SuppressWarnings("unused")
- private void TestStub() {
- // used by testE6
- }
-
- protected void TestStubP() {
- // used by testE7
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
deleted file mode 100644
index 2368dc3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_1;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_10;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_14;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_15;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_17;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_18;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_19;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_2;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_20;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_4;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_5;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_6;
-import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_7;
-
-public class Test_invoke_virtual_range extends DxTestCase {
-
- /**
- * @title invoke virtual method
- */
- public void testN1() {
- T_invoke_virtual_range_1 t = new T_invoke_virtual_range_1();
- int a = 1;
- String sa = "a" + a;
- String sb = "a1";
- assertTrue(t.run(sa, sb));
- assertFalse(t.run(t, sa));
- assertFalse(t.run(sb, t));
- }
-
- /**
- * @title Invoke protected method of superclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_7
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- T_invoke_virtual_range_7 t = new T_invoke_virtual_range_7();
- assertEquals(5, t.run());
- }
-
- /**
- * @title Check that new frame is created by invoke_virtual_range and
- * arguments are passed to method
- */
- public void testN5() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_14
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- T_invoke_virtual_range_14 t = new T_invoke_virtual_range_14();
- assertTrue(t.run());
- }
-
- /**
- * @title Recursion of method lookup procedure
- */
- public void testN6() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_17
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- T_invoke_virtual_range_17 t = new T_invoke_virtual_range_17();
- assertEquals(5, t.run());
- }
-
- /**
- * @title Big number of arguments
- */
- public void testN7() {
- T_invoke_virtual_range_2 t = new T_invoke_virtual_range_2();
- assertEquals(1, t.run());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE1() {
- T_invoke_virtual_range_1 t = new T_invoke_virtual_range_1();
- String s = "s";
- try {
- t.run(null, s);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title Native method can't be linked
- */
- public void testE2() {
- T_invoke_virtual_range_4 t = new T_invoke_virtual_range_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
- }
-
- /**
- * @title Attempt to invoke abstract method
- */
- public void testE4() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_6
- //@uses dot.junit.opcodes.invoke_virtual_range.ATest
- T_invoke_virtual_range_6 t = new T_invoke_virtual_range_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
- }
-
- /**
- * @constraint A14
- * @title invalid constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <clinit> may not be called using invoke-virtual
- */
- public void testVFE3() {
- try {
- new T_invoke_virtual_range_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title number of arguments passed to method
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B9
- * @title types of arguments passed to method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A15
- * @title <init> may not be called using invoke_virtual_range
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * protected method
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_22
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B10
- * @title assignment incompatible references when accessing
- * public method
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_23
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to call static method.
- */
- public void testVFE10() {
- try {
- new T_invoke_virtual_range_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to invoke non-existing method.
- */
- public void testVFE12() {
- try {
- new T_invoke_virtual_range_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to invoke private method of other class.
- */
- public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_18
- //@uses dot.junit.opcodes.invoke_virtual_range.TestStubs
- try {
- new T_invoke_virtual_range_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to invoke protected method of unrelated class.
- */
- public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_20
- //@uses dot.junit.opcodes.invoke_virtual_range.TestStubs
- try {
- new T_invoke_virtual_range_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Method has different signature.
- */
- public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_19
- //@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- try {
- new T_invoke_virtual_range_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title invoke-virtual/range shall be used to invoke private methods
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A14
- * @title attempt to invoke interface method
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance methods may only be invoked on already initialized instances.
- */
- public void testVFE19() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/Snippet.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/Snippet.java
deleted file mode 100644
index 14c735e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/Snippet.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class Snippet {
- public void test() {
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TPlain.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TPlain.d
deleted file mode 100644
index c39399e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TPlain.d
+++ /dev/null
@@ -1,31 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TPlain.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.TPlain
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper.d
deleted file mode 100644
index 7b4d7b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper.d
+++ /dev/null
@@ -1,67 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.TSuper
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-
-.method public toInt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public toInt(F)I
-.limit regs 3
- int-to-float v0, v2
- return v0
-.end method
-
-.method public native toIntNative()I
-.end method
-
-.method public static toIntStatic()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method protected toIntP()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method private toIntPvt()I
-.limit regs 3
- const v0, 5
- return v0
-.end method
-
-.method public testArgsOrder(II)I
-.limit regs 4
- const v0, 349
- const v1, 344656
- div-int v2, v2, v3
- return v2
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper2.d
deleted file mode 100644
index 882b227..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper2.d
+++ /dev/null
@@ -1,30 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TSuper2.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.TSuper2
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public test()I
-.limit regs 3
- const v0, 123
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.d
deleted file mode 100644
index b7f13d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_1.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual/range {v6..v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.java
deleted file mode 100644
index 2c49efe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class T_invoke_virtual_range_1 {
-
- public boolean run(Object x, Object y) {
- return x.equals(y);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.d
deleted file mode 100644
index 3f327a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_10.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_10
-.super java/lang/Object
-
-.method static <clinit>()V
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 1
- invoke-virtual/range {v0}, dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_10/<clinit>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.java
deleted file mode 100644
index bc32697..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class T_invoke_virtual_range_10 {
-
- public void run() {
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11.d
deleted file mode 100644
index b109ace..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_11.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual/range {v6}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12.d
deleted file mode 100644
index 9b63ef8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_12.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test(Ljava/lang/String;)V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- move-object v6, v5
- invoke-virtual/range {v6..v7}, dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_12/test(Ljava/lang/String;)V
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13.d
deleted file mode 100644
index fd6de25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_13.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private getInt()I
-.limit regs 3
- const/16 v1, 345
- return v1
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13/getInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.d
deleted file mode 100644
index 32cd481..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.d
+++ /dev/null
@@ -1,57 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_14.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_14
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 7
-
- const v1, 123
- const v2, 659
-
- const v4, 300
- const v5, 3
- move-object v3, v6
-
- invoke-virtual/range {v3..v5}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14/testArgsOrder(II)I
-
- move-result v3
- const v4, 100
- if-ne v3, v4, Label0
-
- const v4, 123
- if-ne v1, v4, Label0
-
- const v4, 659
- if-ne v2, v4, Label0
-
- const v0, 1
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.java
deleted file mode 100644
index c3b8e0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-
-public class T_invoke_virtual_range_14{
-
- public boolean run() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.d
deleted file mode 100644
index d42643b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_15.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_15
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15/testN()V
- return-void
-.end method
-
-.method public test()V
-.limit regs 1
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.java
deleted file mode 100644
index 969a1ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class T_invoke_virtual_range_15 {
- public void run() {
- }
- public void test() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16.d
deleted file mode 100644
index 5a71786..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16.d
+++ /dev/null
@@ -1,26 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_16.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
- invoke-virtual/range {v2}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.d
deleted file mode 100644
index 173c6bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_17.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_17
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17/toInt()I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.java
deleted file mode 100644
index 689f741..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-
-public class T_invoke_virtual_range_17 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.d
deleted file mode 100644
index cc11d06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_18.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_18
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_virtual_range/TestStubs;)V
-.limit regs 5
- invoke-virtual/range {v4}, dot/junit/opcodes/invoke_virtual_range/TestStubs/TestStub()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.java
deleted file mode 100644
index 8f01c30..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-import dot.junit.opcodes.invoke_virtual_range.TestStubs;
-
-public class T_invoke_virtual_range_18 {
- public void run(TestStubs stubs) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.d
deleted file mode 100644
index 704726b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_19.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_19
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- move-object v2, v3
- const/4 v3, 1
- invoke-virtual/range {v2..v3}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19/toInt(I)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.java
deleted file mode 100644
index fefa96d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-
-public class T_invoke_virtual_range_19 {
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.d
deleted file mode 100644
index eac70b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.d
+++ /dev/null
@@ -1,77 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_2.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test(IIIIIIIIII)I
-.limit regs 11
- const v0, 10
- if-ne v0, v10, Label0
- const v0, 9
- if-ne v0, v9, Label0
- const v0, 8
- if-ne v0, v8, Label0
- const v0, 7
- if-ne v0, v7, Label0
- const v0, 6
- if-ne v0, v6, Label0
- const v0, 5
- if-ne v0, v5, Label0
- const v0, 4
- if-ne v0, v4, Label0
- const v0, 3
- if-ne v0, v3, Label0
- const v0, 2
- if-ne v0, v2, Label0
- const v0, 1
- if-ne v0, v1, Label0
-
- const v0, 1
- return v0
-Label0:
- const v0, 0
- return v0
-
-.end method
-
-.method public run()I
-.limit regs 16
- move-object v0, v15
- const v1, 1
- const v2, 2
- const v3, 3
- const v4, 4
- const v5, 5
- const v6, 6
- const v7, 7
- const v8, 8
- const v9, 9
- const v10, 10
-
- invoke-virtual/range {v0..v10}, dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_2/test(IIIIIIIIII)I
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.java
deleted file mode 100644
index bc934f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class T_invoke_virtual_range_2 {
-
- public int run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.d
deleted file mode 100644
index ab7a4cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_20.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_20
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_virtual_range/TestStubs;)V
-.limit regs 5
-Label0:
-
- invoke-virtual/range {v4}, dot/junit/opcodes/invoke_virtual_range/TestStubs/TestStubP()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.java
deleted file mode 100644
index 77c639d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-import dot.junit.opcodes.invoke_virtual_range.TestStubs;
-
-public class T_invoke_virtual_range_20 {
- public void run(TestStubs stubs) {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22.d
deleted file mode 100644
index 6f6fad5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_22.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_22
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_virtual_range/d/TPlain
- invoke-direct {v2}, dot/junit/opcodes/invoke_virtual_range/d/TPlain/<init>()V
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23.d
deleted file mode 100644
index cf21428..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_23.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_23
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper2
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper2/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- new-instance v2, dot/junit/opcodes/invoke_virtual_range/d/TSuper
- invoke-direct {v2}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/TSuper2/test()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_24.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_24.d
deleted file mode 100644
index 9e2022f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_24.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TTestInterface.java
-.interface public dot.junit.opcodes.invoke_virtual_range.d.TTestInterface
-
-.method public abstract test()V
-.end method
-
-.source T_invoke_virtual_range_24.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24
-.super java/lang/Object
-.implements dot.junit.opcodes.invoke_virtual_range.d.TTestInterface
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public test()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- invoke-virtual/range {v3}, dot/junit/opcodes/invoke_virtual_range/d/TTestInterface/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_25.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_25.d
deleted file mode 100644
index 1d39236..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_25.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_25.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_25
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
-
- new-instance v6, java/lang/Object
- invoke-virtual/range {v6, v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4.d
deleted file mode 100644
index f68a194..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_4.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4/test()V
- return-void
-.end method
-
-.method public native test()V
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4.java
deleted file mode 100644
index 3b6eff0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class T_invoke_virtual_range_4 {
-
- public native void test();
-
- public void run() {
- test();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.d
deleted file mode 100644
index 361e00c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_5.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static test()V
-.limit regs 0
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.java
deleted file mode 100644
index b14ffb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-public class T_invoke_virtual_range_5 {
- public static void test() {
- }
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.d
deleted file mode 100644
index 2dcf120..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_6.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_6
-.super dot/junit/opcodes/invoke_virtual_range/ATest
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/ATest/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/ATest/test()V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.java
deleted file mode 100644
index 52bdea9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-import dot.junit.opcodes.invoke_virtual_range.ATest;
-
-public class T_invoke_virtual_range_6 extends ATest {
-
- public void test(){
- int i = 2+5;
- }
-
- public void run() {
- test();
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.d
deleted file mode 100644
index b5c44f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_7.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_7
-.super dot/junit/opcodes/invoke_virtual_range/d/TSuper
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, dot/junit/opcodes/invoke_virtual_range/d/TSuper/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- invoke-virtual/range {v2}, dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7/toIntP()I
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.java b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.java
deleted file mode 100644
index 333e3ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.invoke_virtual_range.d;
-
-
-public class T_invoke_virtual_range_7 {
-
- public int run() {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.d
deleted file mode 100644
index e2538f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_8.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual/range {v6..v7}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.dfh
deleted file mode 100644
index 390f2a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.dfh
+++ /dev/null
@@ -1,290 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a1e659ab
- AB 59 E6 A1
-// parsed: offset 12, len 20: signature : 8e95...8017
- 8E 95 BB E6 C0 B0 72 A9 B2 A8 7C 08 01 0B 76 DC A6 B9 80 17
-// parsed: offset 32, len 4: file_size : 644
- 84 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 508 (0x0001fc)
- FC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 10
- 0A 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 236 (0x0000ec)
- EC 00 00 00
-// parsed: offset 104, len 4: data_size : 376
- 78 01 00 00
-// parsed: offset 108, len 4: data_off : 268 (0x00010c)
- 0C 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 336 (0x000150) "<init>"
- 50 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 344 (0x000158) "Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8;"
- 58 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 413 (0x00019d) "Ljava/lang/Object;"
- 9D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 433 (0x0001b1) "T_invoke_virtual_range_8.java"
- B1 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 464 (0x0001d0) "V"
- D0 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 467 (0x0001d3) "Z"
- D3 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 470 (0x0001d6) "ZL"
- D6 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 474 (0x0001da) "ZLL"
- DA 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 479 (0x0001df) "equals"
- DF 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 487 (0x0001e7) "run"
- E7 01 00 00
-
-// type_ids:
-// parsed: offset 152, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8;"
- 01 00 00 00
-// parsed: offset 156, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 160, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 164, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 6 (0x000006) "ZL"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 320 (0x000140)
- 06 00 00 00 03 00 00 00 40 01 00 00
-// parsed: offset 192, len 12: [2]
-// shorty_idx: 7 (0x000007) "ZLL"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 328 (0x000148)
- 07 00 00 00 03 00 00 00 48 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 204, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 212, len 8: [1] class_idx: 0 (0x000000) proto_idx: 2 (0x000002) name_idx: 9 (0x000009) "run"
- 00 00 02 00 09 00 00 00
-// parsed: offset 220, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 228, len 8: [3] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "equals"
- 01 00 01 00 08 00 00 00
-
-// class_defs:
-// parsed: offset 236, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_invoke_virtual_range_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 492 (0x0001ec)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 EC 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_8.<init>"
- // parsed: offset 268, len 2: registers_size: 2
- 02 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 1
- 01 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 284, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 01 00
- // parsed: offset 290, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_8.run"
- // parsed: offset 292, len 2: registers_size: 8
- 08 00
- // parsed: offset 294, len 2: ins_size: 3
- 03 00
- // parsed: offset 296, len 2: outs_size: 2
- 02 00
- // parsed: offset 298, len 2: tries_size: 0
- 00 00
- // parsed: offset 300, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 304, len 4: insns_size: 5
- 05 00 00 00
- // insns:
- // parsed: offset 308, len 6: |0000: invoke-virtual/range {v6..v7}, Ljava/lang/Object;.equals:(Ljava/lang/Object;)Z // method@0003
-//@mod 74 02 03 00 06 00
- 74 02 03 01 06 00
- // parsed: offset 314, len 2: |0003: move-result v0
- 0A 00
- // parsed: offset 316, len 2: |0004: return v0
- 0F 00
- // tries:
- // handlers:
-// parsed: offset 318, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 320, len 4: size: 1
- 01 00 00 00
- // parsed: offset 324, len 2: type_item [0] type_idx: 1
- 01 00
-// parsed: offset 326, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 2
- 02 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 1
- 01 00
- // parsed: offset 334, len 2: type_item [1] type_idx: 1
- 01 00
-// parsed: offset 336, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 344, len 69: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8;"
- 43 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 6E 76 6F 6B 65 5F 76 69 72 74 75 61 6C 5F 72 61 6E 67 65 2F 64 2F 54 5F 69 6E 76 6F 6B 65 5F 76 69 72 74 75 61 6C 5F 72 61 6E 67 65 5F 38 3B 00
-// parsed: offset 413, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 433, len 31: TYPE_STRING_DATA_ITEM [3] "T_invoke_virtual_range_8.java"
- 1D 54 5F 69 6E 76 6F 6B 65 5F 76 69 72 74 75 61 6C 5F 72 61 6E 67 65 5F 38 2E 6A 61 76 61 00
-// parsed: offset 464, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 467, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 470, len 4: TYPE_STRING_DATA_ITEM [6] "ZL"
- 02 5A 4C 00
-// parsed: offset 474, len 5: TYPE_STRING_DATA_ITEM [7] "ZLL"
- 03 5A 4C 4C 00
-// parsed: offset 479, len 8: TYPE_STRING_DATA_ITEM [8] "equals"
- 06 65 71 75 61 6C 73 00
-// parsed: offset 487, len 5: TYPE_STRING_DATA_ITEM [9] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8;"
- // parsed: offset 492, len 1: static_fields_size: 0
- 00
- // parsed: offset 493, len 1: instance_fields_size: 0
- 00
- // parsed: offset 494, len 1: direct_methods_size: 1
- 01
- // parsed: offset 495, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 496, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 497, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 500, len 2: code_off: 268 (0x00010c)
- 8C 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 502, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 503, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 504, len 2: code_off: 292 (0x000124)
- A4 02
-// parsed: offset 506, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 508, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 512, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 524, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 10
- // offset: 112 (0x000070)
- 01 00 00 00 0A 00 00 00 70 00 00 00
- // parsed: offset 536, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 152 (0x000098)
- 02 00 00 00 04 00 00 00 98 00 00 00
- // parsed: offset 548, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 168 (0x0000a8)
- 03 00 00 00 03 00 00 00 A8 00 00 00
- // parsed: offset 560, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 204 (0x0000cc)
- 05 00 00 00 04 00 00 00 CC 00 00 00
- // parsed: offset 572, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 236 (0x0000ec)
- 06 00 00 00 01 00 00 00 EC 00 00 00
- // parsed: offset 584, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 268 (0x00010c)
- 01 20 00 00 02 00 00 00 0C 01 00 00
- // parsed: offset 596, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 2
- // offset: 320 (0x000140)
- 01 10 00 00 02 00 00 00 40 01 00 00
- // parsed: offset 608, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 10
- // offset: 336 (0x000150)
- 02 20 00 00 0A 00 00 00 50 01 00 00
- // parsed: offset 620, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 492 (0x0001ec)
- 00 20 00 00 01 00 00 00 EC 01 00 00
- // parsed: offset 632, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 508 (0x0001fc)
- 00 10 00 00 01 00 00 00 FC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9.d b/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9.d
deleted file mode 100644
index 393f733..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invoke_virtual_range_9.java
-.class public dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-.limit regs 8
-
- invoke-virtual/range {v7..v8}, java/lang/Object/equals(Ljava/lang/Object;)Z
-
- move-result v0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput/TestStubs.java
deleted file mode 100644
index 8ebe9bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput;
-
-public class TestStubs {
- // used by testVFE9
- protected int TestStubField = 0;
-
- // used by testE5
- public final int TestStubFieldFinal = 0;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/Test_iput.java b/tools/vm-tests/src/dot/junit/opcodes/iput/Test_iput.java
deleted file mode 100644
index f69b308..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/Test_iput.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput.d.T_iput_1;
-import dot.junit.opcodes.iput.d.T_iput_10;
-import dot.junit.opcodes.iput.d.T_iput_11;
-import dot.junit.opcodes.iput.d.T_iput_12;
-import dot.junit.opcodes.iput.d.T_iput_13;
-import dot.junit.opcodes.iput.d.T_iput_14;
-import dot.junit.opcodes.iput.d.T_iput_15;
-import dot.junit.opcodes.iput.d.T_iput_17;
-import dot.junit.opcodes.iput.d.T_iput_19;
-import dot.junit.opcodes.iput.d.T_iput_5;
-import dot.junit.opcodes.iput.d.T_iput_7;
-import dot.junit.opcodes.iput.d.T_iput_8;
-import dot.junit.opcodes.iput.d.T_iput_9;
-
-public class Test_iput extends DxTestCase {
-
- /**
- * @title type - int
- */
- public void testN1() {
- T_iput_1 t = new T_iput_1();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(1000000, t.st_i1);
- }
-
- /**
- * @title type - float
- */
- public void testN2() {
- T_iput_19 t = new T_iput_19();
- assertEquals(0.0f, t.st_f1);
- t.run();
- assertEquals(3.14f, t.st_f1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN3() {
- T_iput_12 t = new T_iput_12();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(1000000, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput.d.T_iput_1
- //@uses dot.junit.opcodes.iput.d.T_iput_14
- T_iput_14 t = new T_iput_14();
- assertEquals(0, t.getProtectedField());
- t.run();
- assertEquals(1000000, t.getProtectedField());
- }
-
- /**
- * @title Trying to put float into integer field. Dalvik doens't distinguish 32-bits types
- * internally, so this operation makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_iput_5 t = new T_iput_5();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_13 t = new T_iput_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title put integer into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify double field
- * with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A11
- * @title Attempt to set static field.
- */
- public void testVFE8() {
- try {
- new T_iput_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput.TestStubs
- //@uses dot.junit.opcodes.iput.d.T_iput_8
- try {
- new T_iput_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput.d.T_iput_1
- //@uses dot.junit.opcodes.iput.d.T_iput_15
- try {
- new T_iput_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput shall not work for boolean fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput shall not work for char fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput shall not work for byte fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testE5() {
- //@uses dot.junit.opcodes.iput.TestStubs
- //@uses dot.junit.opcodes.iput.d.T_iput_11
- try {
- new T_iput_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_1.d
deleted file mode 100644
index 062a5f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_1.java
-.class public dot.junit.opcodes.iput.d.T_iput_1
-.super java/lang/Object
-
-.field public st_i1 I
-.field protected st_p1 I
-.field private st_pvt1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()I
-.limit regs 2
-
- iget v0, v1, dot.junit.opcodes.iput.d.T_iput_1.st_pvt1 I
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_1.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_1.java
deleted file mode 100644
index b508414..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_1 {
- public int st_i1;
- protected int st_p1;
- private int st_pvt1;
-
- public void run() {
- st_i1 = 1000000;
- }
-
- public int getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_10.d
deleted file mode 100644
index 782486a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_10.java
-.class public dot.junit.opcodes.iput.d.T_iput_10
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_10.st_i1N I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_10.java
deleted file mode 100644
index 4f630e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_11.d
deleted file mode 100644
index 9fb06de..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_11.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_11.java
-.class public dot.junit.opcodes.iput.d.T_iput_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput/TestStubs/<init>()V
-
- const v1, 1000000
- iput v1, v0, dot.junit.opcodes.iput.TestStubs.TestStubFieldFinal I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_11.java
deleted file mode 100644
index 9c47bd5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_12.d
deleted file mode 100644
index 73104b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_12.java
-.class public dot.junit.opcodes.iput.d.T_iput_12
-.super java/lang/Object
-
-.field public final st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_12.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_12.java
deleted file mode 100644
index 4fbe9c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_12 {
- public int st_i1;
-
- public void run() {
- st_i1 = 1000000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_13.d
deleted file mode 100644
index 3760a4f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_13.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_13.java
-.class public dot.junit.opcodes.iput.d.T_iput_13
-.super java/lang/Object
-
-.field public st_i1 I
-.field protected st_p1 I
-.field private st_pvt1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 0
- const v1, 1000000
- iput v1, v0, dot.junit.opcodes.iput.d.T_iput_13.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_13.java
deleted file mode 100644
index 53423f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_14.d
deleted file mode 100644
index ba404d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_14.java
-.class public dot.junit.opcodes.iput.d.T_iput_14
-.super dot/junit/opcodes/iput/d/T_iput_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput/d/T_iput_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()I
-.limit regs 2
-
- iget v0, v1, dot.junit.opcodes.iput.d.T_iput_1.st_p1 I
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_1.st_p1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_14.java
deleted file mode 100644
index 7d7e102..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_14 extends T_iput_1{
-
- public void run() {
- st_p1 = 1000000;
- }
-
- public int getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_15.d
deleted file mode 100644
index 8864195..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_15.java
-.class public dot.junit.opcodes.iput.d.T_iput_15
-.super dot/junit/opcodes/iput/d/T_iput_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput/d/T_iput_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 12321
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_1.st_pvt1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_15.java
deleted file mode 100644
index f432d27..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_17.d
deleted file mode 100644
index e0b35ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_17.java
-.class public dot.junit.opcodes.iput.d.T_iput_17
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_17.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_17.java
deleted file mode 100644
index 0c1bb0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_18.d
deleted file mode 100644
index 1ec565d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_18.java
-.class public dot.junit.opcodes.iput.d.T_iput_18
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_19.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_19.d
deleted file mode 100644
index f7f8997..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_19.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_19.java
-.class public dot.junit.opcodes.iput.d.T_iput_19
-.super java/lang/Object
-
-.field public st_f1 F
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 3.14
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_19.st_f1 F
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_19.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_19.java
deleted file mode 100644
index bf6deee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_19.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_19 {
- public float st_f1;
-
-
- public void run() {
- st_f1 = 3.14f;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_2.d
deleted file mode 100644
index a89c29d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_2.java
-.class public dot.junit.opcodes.iput.d.T_iput_2
-.super java/lang/Object
-
-.field public st_d1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const-wide v1, 1000000.000000
- iput v1, v3, dot.junit.opcodes.iput.d.T_iput_2.st_d1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_20.d
deleted file mode 100644
index 0161449..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_20.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_20.java
-.class public dot.junit.opcodes.iput.d.T_iput_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 0
- iput v0, v3, dot.junit.opcodes.iput.d.T_iput_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_21.d
deleted file mode 100644
index f189066..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_21.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_21.java
-.class public dot.junit.opcodes.iput.d.T_iput_21
-.super java/lang/Object
-
-.field public st_s S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1234
- iput v0, v3, dot.junit.opcodes.iput.d.T_iput_21.st_s S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_22.d
deleted file mode 100644
index 71b8cdf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_22.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_22.java
-.class public dot.junit.opcodes.iput.d.T_iput_22
-.super java/lang/Object
-
-.field public st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput v0, v3, dot.junit.opcodes.iput.d.T_iput_22.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_23.d
deleted file mode 100644
index e0bf2a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_23.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_23.java
-.class public dot.junit.opcodes.iput.d.T_iput_23
-.super java/lang/Object
-
-.field public st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput v0, v3, dot.junit.opcodes.iput.d.T_iput_23.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_24.d
deleted file mode 100644
index 4e6d187..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_24.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_24.java
-.class public dot.junit.opcodes.iput.d.T_iput_24
-.super java/lang/Object
-
-.field public st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput v0, v3, dot.junit.opcodes.iput.d.T_iput_24.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_3.d
deleted file mode 100644
index bdb6b35..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_3.java
-.class public dot.junit.opcodes.iput.d.T_iput_3
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1234
- iput v0, v2, dot.junit.opcodes.iput.d.T_iput_3.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_3.dfh
deleted file mode 100644
index 0474f19..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput/d/T_iput_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput/d/T_iput_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 3bce3c78
- 78 3C CE 3B
-// parsed: offset 12, len 20: signature : 15da...0f9b
- 15 DA 79 0D 61 BF 5F C9 34 71 F7 04 83 3D 02 17 E9 5E 0F 9B
-// parsed: offset 32, len 4: file_size : 540
- 1C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 404 (0x000194)
- 94 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 304
- 30 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "I"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/iput/d/T_iput_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 336 (0x000150) "Ljava/lang/Object;"
- 50 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 356 (0x000164) "T_iput_3.java"
- 64 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 371 (0x000173) "V"
- 73 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 374 (0x000176) "run"
- 76 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 379 (0x00017b) "st_i1"
- 7B 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iput/d/T_iput_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iput/d/T_iput_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iput_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 386 (0x000182)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 82 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput.d.T_iput_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput.d.T_iput_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x000004d2 int
- 14 00 D2 04 00 00
- // parsed: offset 282, len 4: |0003: iput v0, v2, Ldot/junit/opcodes/iput/d/T_iput_3;.st_i1:I // field@0000
-//@mod 59 20 00 00
- 59 20 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 299, len 37: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iput/d/T_iput_3;"
- 23 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 2F 64 2F 54 5F 69 70 75 74 5F 33 3B 00
-// parsed: offset 336, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 356, len 15: TYPE_STRING_DATA_ITEM [4] "T_iput_3.java"
- 0D 54 5F 69 70 75 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 371, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 374, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 379, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput/d/T_iput_3;"
- // parsed: offset 386, len 1: static_fields_size: 0
- 00
- // parsed: offset 387, len 1: instance_fields_size: 1
- 01
- // parsed: offset 388, len 1: direct_methods_size: 1
- 01
- // parsed: offset 389, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 390, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 391, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 392, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 393, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 396, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 398, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 399, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 400, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 402, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 404, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 408, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 420, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 432, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 444, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 456, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 468, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 480, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 492, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 504, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 516, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 386 (0x000182)
- 00 20 00 00 01 00 00 00 82 01 00 00
- // parsed: offset 528, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 404 (0x000194)
- 00 10 00 00 01 00 00 00 94 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_30.d
deleted file mode 100644
index 08df316..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_30.java
-.class public dot.junit.opcodes.iput.d.T_iput_30
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput/d/T_iput_30
- const v1, 0
- iput v1, v0, dot.junit.opcodes.iput.d.T_iput_30.st_i1 I
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_4.d
deleted file mode 100644
index f324be4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_4.java
-.class public dot.junit.opcodes.iput.d.T_iput_4
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput v3, v2, dot.junit.opcodes.iput.d.T_iput_4.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_5.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_5.d
deleted file mode 100644
index c34dbac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_5.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_5.java
-.class public dot.junit.opcodes.iput.d.T_iput_5
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)V
-.limit regs 3
-
- iput v2, v1, dot.junit.opcodes.iput.d.T_iput_5.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_5.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_5.java
deleted file mode 100644
index 6df6a7f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_5 {
- public int st_i1;
-
- public void run(float f) {
- st_i1 = 1000000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_7.d
deleted file mode 100644
index af7b003..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_7.java
-.class public dot.junit.opcodes.iput.d.T_iput_7
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_7.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_7.java
deleted file mode 100644
index c7407e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_8.d
deleted file mode 100644
index 6c1ed20..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_8.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_8.java
-.class public dot.junit.opcodes.iput.d.T_iput_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput/TestStubs/<init>()V
-
- const v1, 0
- iput v1, v0, dot.junit.opcodes.iput.TestStubs.TestStubField I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_8.java
deleted file mode 100644
index 264aef0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_9.d
deleted file mode 100644
index 7c7d755..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_9.java
-.class public dot.junit.opcodes.iput.d.T_iput_9
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput v1, v2, dot.junit.opcodes.iput.d.T_iput_9noclass.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_9.java
deleted file mode 100644
index a3c1695..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_iput_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput.d;
-
-public class T_iput_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_sput_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_sput_3.dfh
deleted file mode 100644
index f7d95ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput/d/T_sput_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput/d/T_sput_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput/d/T_sput_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 07553f66
- 66 3F 55 07
-// parsed: offset 12, len 20: signature : 2441...71d9
- 24 41 F7 4C E7 A3 98 B5 AC 67 0E F8 6B D1 13 E3 DD 10 71 D9
-// parsed: offset 32, len 4: file_size : 540
- 1C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 404 (0x000194)
- 94 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 304
- 30 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "I"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/sput/d/T_sput_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 336 (0x000150) "Ljava/lang/Object;"
- 50 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 356 (0x000164) "T_sput_3.java"
- 64 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 371 (0x000173) "V"
- 73 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 374 (0x000176) "run"
- 76 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 379 (0x00017b) "st_i1"
- 7B 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sput/d/T_sput_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sput/d/T_sput_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sput_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 386 (0x000182)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 82 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput.d.T_sput_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput.d.T_sput_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x000004d2 int
- 14 00 D2 04 00 00
- // parsed: offset 282, len 4: |0003: sput v0, Ldot/junit/opcodes/sput/d/T_sput_3;.st_i1:I // field@0000
-//@mod 67 00 00 00
- 67 00 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 299, len 37: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sput/d/T_sput_3;"
- 23 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 2F 64 2F 54 5F 73 70 75 74 5F 33 3B 00
-// parsed: offset 336, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 356, len 15: TYPE_STRING_DATA_ITEM [4] "T_sput_3.java"
- 0D 54 5F 73 70 75 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 371, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 374, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 379, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput/d/T_sput_3;"
- // parsed: offset 386, len 1: static_fields_size: 1
- 01
- // parsed: offset 387, len 1: instance_fields_size: 0
- 00
- // parsed: offset 388, len 1: direct_methods_size: 1
- 01
- // parsed: offset 389, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 390, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 391, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 392, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 393, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 396, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 398, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 399, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 400, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 402, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 404, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 408, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 420, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 432, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 444, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 456, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 468, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 480, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 492, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 504, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 516, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 386 (0x000182)
- 00 20 00 00 01 00 00 00 82 01 00 00
- // parsed: offset 528, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 404 (0x000194)
- 00 10 00 00 01 00 00 00 94 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/TestStubs.java
deleted file mode 100644
index 07919e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean;
-
-public class TestStubs {
- // used by testVFE9
- protected boolean TestStubField = false;
-
- // used by testE5
- public final boolean TestStubFieldFinal = false;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
deleted file mode 100644
index 6a2419b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_10;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_11;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_12;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_13;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_14;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_15;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_17;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_7;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_8;
-import dot.junit.opcodes.iput_boolean.d.T_iput_boolean_9;
-
-
-public class Test_iput_boolean extends DxTestCase {
-
- /**
- * @title put boolean into field
- */
- public void testN1() {
- T_iput_boolean_1 t = new T_iput_boolean_1();
- assertEquals(false, t.st_i1);
- t.run();
- assertEquals(true, t.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_iput_boolean_12 t = new T_iput_boolean_12();
- assertEquals(false, t.st_i1);
- t.run();
- assertEquals(true, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_14
- T_iput_boolean_14 t = new T_iput_boolean_14();
- assertEquals(false, t.getProtectedField());
- t.run();
- assertEquals(true, t.getProtectedField());
- }
-
-
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_boolean_13 t = new T_iput_boolean_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B14
- * @title put boolean into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_boolean_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B14
- * @title put value '2' into boolean field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A11
- * @title Attempt to set static field.
- */
- public void testVFE8() {
- try {
- new T_iput_boolean_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput_boolean.TestStubs
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_8
- try {
- new T_iput_boolean_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_boolean_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_boolean_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_15
- try {
- new T_iput_boolean_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput_boolean shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput_boolean shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput_boolean shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput_boolean shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iput_boolean shall not work for char fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title iput_boolean shall not work for byte fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.iput_boolean.TestStubs
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_11
- try {
- new T_iput_boolean_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.d
deleted file mode 100644
index 47ee9dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_1.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1
-.super java/lang/Object
-
-.field public st_i1 Z
-.field protected st_p1 Z
-.field private st_pvt1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()Z
-.limit regs 2
-
- iget-boolean v0, v1, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1.st_pvt1 Z
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1.st_i1 Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.java
deleted file mode 100644
index 14d2b98..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_1 {
- public boolean st_i1;
- protected boolean st_p1;
- private boolean st_pvt1;
-
- public void run() {
- st_i1 = true;
- }
-
- public boolean getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.d
deleted file mode 100644
index 77f762a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_10.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_10
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_10.st_i1N Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.java
deleted file mode 100644
index 7279fe0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.d
deleted file mode 100644
index 9f8d148..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_11.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_boolean/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_boolean/TestStubs/<init>()V
-
- const v1, 1
- iput-boolean v1, v0, dot.junit.opcodes.iput_boolean.TestStubs.TestStubFieldFinal Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.java
deleted file mode 100644
index 77de3e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.d
deleted file mode 100644
index 327fef6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_12.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_12
-.super java/lang/Object
-
-.field public final st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_12.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.java
deleted file mode 100644
index 4321bfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_12 {
- public boolean st_i1;
-
- public void run() {
- st_i1 = true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.d
deleted file mode 100644
index cbe6560..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_13.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_13
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 0
- const v1, 1
- iput-boolean v1, v0, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_13.st_i1 Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.java
deleted file mode 100644
index c523c5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.d
deleted file mode 100644
index 8a7f23e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_14.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_14
-.super dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()Z
-.limit regs 2
-
- iget-boolean v0, v1, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1.st_p1 Z
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1.st_p1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.java
deleted file mode 100644
index e708762..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_14 extends T_iput_boolean_1{
-
- public void run() {
- st_p1 = true;
- }
-
- public boolean getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.d
deleted file mode 100644
index 605fab5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_15.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_15
-.super dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1.st_pvt1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.java
deleted file mode 100644
index 893595b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.d
deleted file mode 100644
index 2d0e858..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_17.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_17
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_17.st_i1 Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.java
deleted file mode 100644
index c7dbaeb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_18.d
deleted file mode 100644
index 5ca6791..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_18.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_18
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_19.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_19.d
deleted file mode 100644
index aed12db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_19.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_19.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_19
-.super java/lang/Object
-
-.field public st_f1 F
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 3.14
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_19.st_f1 F
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_19.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_19.java
deleted file mode 100644
index 3828d90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_19.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_19 {
- public float st_f1;
-
-
- public void run() {
- st_f1 = 3.14f;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_2.d
deleted file mode 100644
index 20ba2cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_2.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_2
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-boolean v0, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_4.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_20.d
deleted file mode 100644
index b7bb68c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_20.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_20.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 0
- iput-boolean v0, v3, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_21.d
deleted file mode 100644
index a05e7d9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_21.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_21.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_21
-.super java/lang/Object
-
-.field public st_s S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput-boolean v0, v3, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_21.st_s S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_22.d
deleted file mode 100644
index 5953110..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_22.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_22.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_22
-.super java/lang/Object
-
-.field public st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput-boolean v0, v3, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_23.d
deleted file mode 100644
index 3d51bf4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_23.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_23.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_23
-.super java/lang/Object
-
-.field public st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput-boolean v0, v3, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_23.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_24.d
deleted file mode 100644
index ccd56a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_24.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_24.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_24
-.super java/lang/Object
-
-.field public st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v0, 1
- iput-boolean v0, v3, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_24.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.d
deleted file mode 100644
index 864852f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_3.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- iput-boolean v0, v3, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.dfh
deleted file mode 100644
index 971a7eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 77b34b2d
- 2D 4B B3 77
-// parsed: offset 12, len 20: signature : 6ffc...5670
- 6F FC D3 2C 6D F3 E5 94 FA 99 F9 FC 05 BD 3A 88 8C CD 56 70
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 328
- 48 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 349 (0x00015d) "Ljava/lang/Object;"
- 5D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 369 (0x000171) "T_iput_boolean_3.java"
- 71 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 392 (0x000188) "V"
- 88 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "Z"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "run"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "st_i1"
- 93 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 0 (0x000000) type_idx: 3 (0x000003) name_idx: 7 (0x000007) "st_i1"
- 00 00 03 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 00 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_iput_boolean_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: iput-boolean v0, v3, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;.st_i1:Z // field@0000
-//@mod 5C 30 00 00
- 5C 30 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 53: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 5F 62 6F 6F 6C 65 61 6E 2F 64 2F 54 5F 69 70 75 74 5F 62 6F 6F 6C 65 61 6E 5F 33 3B 00
-// parsed: offset 349, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 369, len 23: TYPE_STRING_DATA_ITEM [3] "T_iput_boolean_3.java"
- 15 54 5F 69 70 75 74 5F 62 6F 6F 6C 65 61 6E 5F 33 2E 6A 61 76 61 00
-// parsed: offset 392, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 398, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 403, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;"
- // parsed: offset 410, len 1: static_fields_size: 0
- 00
- // parsed: offset 411, len 1: instance_fields_size: 1
- 01
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 414, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 415, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30.d
deleted file mode 100644
index f68e154..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_30.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_30
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30
- const v1, 0
- iput-boolean v1, v0, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_30.st_i1 Z
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_4.d
deleted file mode 100644
index 5b0d440..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_4.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_4
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-boolean v3, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_4.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_6.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_6.d
deleted file mode 100644
index 29230ed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_6.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_6
-.super java/lang/Object
-
-.field public s Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v2, 2
- iput-boolean v2, v5, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_6.s Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.d
deleted file mode 100644
index 1c26b25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_7.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_7
-.super java/lang/Object
-
-.field public static st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_7.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.java
deleted file mode 100644
index c48328e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.d
deleted file mode 100644
index ce16612..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_8.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_boolean/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_boolean/TestStubs/<init>()V
- const v1, 0
- iput-boolean v1, v0, dot.junit.opcodes.iput_boolean.TestStubs.TestStubField Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.java
deleted file mode 100644
index 6706b11..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.d
deleted file mode 100644
index b740349..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_boolean_9.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_9
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-boolean v1, v2, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_9noclass.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.java
deleted file mode 100644
index 86c2fbf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_boolean.d;
-
-public class T_iput_boolean_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/TestStubs.java
deleted file mode 100644
index c8906b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte;
-
-public class TestStubs {
- // used by testVFE9
- protected byte TestStubField = 77;
-
- // used by testE5
- public final byte TestStubFieldFinal = 77;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
deleted file mode 100644
index f67e22b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_1;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_10;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_11;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_12;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_13;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_14;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_15;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_17;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_7;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_8;
-import dot.junit.opcodes.iput_byte.d.T_iput_byte_9;
-
-public class Test_iput_byte extends DxTestCase {
- /**
- * @title put byte into field
- */
- public void testN1() {
- T_iput_byte_1 t = new T_iput_byte_1();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_iput_byte_12 t = new T_iput_byte_12();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_1
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_14
- T_iput_byte_14 t = new T_iput_byte_14();
- assertEquals(0, t.getProtectedField());
- t.run();
- assertEquals(77, t.getProtectedField());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_byte_13 t = new T_iput_byte_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title put byte into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_byte_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B14
- * @title put value '256' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A11
- * @title Attempt to set static field.
- */
- public void testVFE8() {
- try {
- new T_iput_byte_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput_byte.TestStubs
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_8
- try {
- new T_iput_byte_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_byte_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_byte_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_1
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_15
- try {
- new T_iput_byte_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput-byte shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-byte shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-byte shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-byte shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-byte shall not work for char fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-byte shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.iput_byte.TestStubs
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_11
- try {
- new T_iput_byte_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.d
deleted file mode 100644
index 860157b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_1.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_1
-.super java/lang/Object
-
-.field public st_i1 B
-.field protected st_p1 B
-.field private st_pvt1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()B
-.limit regs 2
-
- iget-byte v0, v1, dot.junit.opcodes.iput_byte.d.T_iput_byte_1.st_pvt1 B
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_1.st_i1 B
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.java
deleted file mode 100644
index d926c18..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_1 {
- public byte st_i1;
- protected byte st_p1;
- private byte st_pvt1;
-
- public void run() {
- st_i1 = 77;
- }
-
- public byte getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.d
deleted file mode 100644
index 279b2a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_10.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_10
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_10.st_i1N B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.java
deleted file mode 100644
index f7278f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.d
deleted file mode 100644
index 9c80461..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_11.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_byte/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_byte/TestStubs/<init>()V
-
- const v1, 1
- iput-byte v1, v0, dot.junit.opcodes.iput_byte.TestStubs.TestStubFieldFinal B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.java
deleted file mode 100644
index a77d3c3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.d
deleted file mode 100644
index ee0355b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_12.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_12
-.super java/lang/Object
-
-.field public final st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_12.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.java
deleted file mode 100644
index c64063c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_12 {
- public byte st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.d
deleted file mode 100644
index 26cd104..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_13.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_13
-.super java/lang/Object
-
-.field public st_i1 B
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 0
- const v1, 77
- iput-byte v1, v0, dot.junit.opcodes.iput_byte.d.T_iput_byte_13.st_i1 B
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.java
deleted file mode 100644
index e907164..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_13 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.d
deleted file mode 100644
index 9be11ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_14.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_14
-.super dot/junit/opcodes/iput_byte/d/T_iput_byte_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_byte/d/T_iput_byte_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()B
-.limit regs 2
-
- iget-byte v0, v1, dot.junit.opcodes.iput_byte.d.T_iput_byte_1.st_p1 B
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_1.st_p1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.java
deleted file mode 100644
index e1bcc4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_14 extends T_iput_byte_1{
-
- public void run() {
- st_p1 = 77;
- }
-
- public byte getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.d
deleted file mode 100644
index 2f14e14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_15.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_15
-.super dot/junit/opcodes/iput_byte/d/T_iput_byte_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_byte/d/T_iput_byte_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_1.st_pvt1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.java
deleted file mode 100644
index 249926f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.d
deleted file mode 100644
index 1f8bd94..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_17.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_17
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_17.st_i1 B
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.java
deleted file mode 100644
index 6eca2a9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_18.d
deleted file mode 100644
index 153aae1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_18.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_18
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_2.d
deleted file mode 100644
index 3805c5f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_2.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_2
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-byte v0, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_4.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_20.d
deleted file mode 100644
index 2452e5e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_20.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-byte v3, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d
deleted file mode 100644
index 9f8bd0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_21.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_21
-.super java/lang/Object
-
-.field public st_s I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 12
- iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_21.st_s I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d
deleted file mode 100644
index e0a19be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_22.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_22
-.super java/lang/Object
-
-.field public st_b I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_22.st_b I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_23.d
deleted file mode 100644
index afae162..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_23.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_23
-.super java/lang/Object
-
-.field public st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_23.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_24.d
deleted file mode 100644
index ac31166..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_24.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_24
-.super java/lang/Object
-
-.field public st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.d
deleted file mode 100644
index c3a8828..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_3.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_3
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- iput-byte v0, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_3.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.dfh
deleted file mode 100644
index 74792e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 6e4345b3
- B3 45 43 6E
-// parsed: offset 12, len 20: signature : febf...8438
- FE BF FB D0 A8 35 97 52 FC 71 45 C2 D3 90 2B F7 03 4D 84 38
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "B"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 346 (0x00015a) "Ljava/lang/Object;"
- 5A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 366 (0x00016e) "T_iput_byte_3.java"
- 6E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 386 (0x000182) "V"
- 82 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "run"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 394 (0x00018a) "st_i1"
- 8A 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "B"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iput_byte_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 401 (0x000191)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 91 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput_byte.d.T_iput_byte_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput_byte.d.T_iput_byte_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: iput-byte v0, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;.st_i1:B // field@0000
-//@mod 5D 20 00 00
- 5D 20 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "B"
- 01 42 00
-// parsed: offset 299, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 5F 62 79 74 65 2F 64 2F 54 5F 69 70 75 74 5F 62 79 74 65 5F 33 3B 00
-// parsed: offset 346, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [4] "T_iput_byte_3.java"
- 12 54 5F 69 70 75 74 5F 62 79 74 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 386, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 389, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 394, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;"
- // parsed: offset 401, len 1: static_fields_size: 0
- 00
- // parsed: offset 402, len 1: instance_fields_size: 1
- 01
- // parsed: offset 403, len 1: direct_methods_size: 1
- 01
- // parsed: offset 404, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 405, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 406, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 408, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 411, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 413, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 414, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 415, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 417, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 401 (0x000191)
- 00 20 00 00 01 00 00 00 91 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_30.d
deleted file mode 100644
index b29c0e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_30.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_30
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput_byte/d/T_iput_byte_30
- const v1, 0
- iput-byte v1, v0, dot.junit.opcodes.iput_byte.d.T_iput_byte_30.st_i1 B
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_4.d
deleted file mode 100644
index 18a254f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_4.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_4
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-byte v3, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_4.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_6.d
deleted file mode 100644
index d349e8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_6.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_6
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 256
- iput-byte v0, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_6.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.d
deleted file mode 100644
index 4ac5aa9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_7.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_7
-.super java/lang/Object
-
-.field public static st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_7.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.java
deleted file mode 100644
index 3ff9a3f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.d
deleted file mode 100644
index 34b537c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_8.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_byte/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_byte/TestStubs/<init>()V
-
- const v1, 0
- iput-byte v1, v0, dot.junit.opcodes.iput_byte.TestStubs.TestStubField B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.java
deleted file mode 100644
index 8a29bb2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.d
deleted file mode 100644
index 338b321..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_byte_9.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_9
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-byte v1, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_9noclass.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.java
deleted file mode 100644
index 37f7a6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_byte.d;
-
-public class T_iput_byte_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/TestStubs.java
deleted file mode 100644
index a0d947f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char;
-
-public class TestStubs {
- // used by testVFE9
- protected char TestStubField = 77;
-
- // used by testE5
- public final char TestStubFieldFinal = 77;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/Test_iput_char.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/Test_iput_char.java
deleted file mode 100644
index f3a4f9e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/Test_iput_char.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput_char.d.T_iput_char_1;
-import dot.junit.opcodes.iput_char.d.T_iput_char_10;
-import dot.junit.opcodes.iput_char.d.T_iput_char_11;
-import dot.junit.opcodes.iput_char.d.T_iput_char_12;
-import dot.junit.opcodes.iput_char.d.T_iput_char_13;
-import dot.junit.opcodes.iput_char.d.T_iput_char_14;
-import dot.junit.opcodes.iput_char.d.T_iput_char_15;
-import dot.junit.opcodes.iput_char.d.T_iput_char_17;
-import dot.junit.opcodes.iput_char.d.T_iput_char_7;
-import dot.junit.opcodes.iput_char.d.T_iput_char_8;
-import dot.junit.opcodes.iput_char.d.T_iput_char_9;
-
-public class Test_iput_char extends DxTestCase {
- /**
- * @title put char into field
- */
- public void testN1() {
- T_iput_char_1 t = new T_iput_char_1();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_iput_char_12 t = new T_iput_char_12();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_1
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_14
- T_iput_char_14 t = new T_iput_char_14();
- assertEquals(0, t.getProtectedField());
- t.run();
- assertEquals(77, t.getProtectedField());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_char_13 t = new T_iput_char_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title put char into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_char_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B14
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A11
- * @title Attempt to set static field.
- */
- public void testVFE8() {
- try {
- new T_iput_char_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput_char.TestStubs
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_8
- try {
- new T_iput_char_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_char_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_char_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_1
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_15
- try {
- new T_iput_char_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput-char shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-char shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-char shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-char shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-char shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-char shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.iput_char.TestStubs
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_11
- try {
- new T_iput_char_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.d
deleted file mode 100644
index 1872727..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_1.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_1
-.super java/lang/Object
-
-.field public st_i1 C
-.field protected st_p1 C
-.field private st_pvt1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()C
-.limit regs 2
-
- iget-char v0, v1, dot.junit.opcodes.iput_char.d.T_iput_char_1.st_pvt1 C
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_1.st_i1 C
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.java
deleted file mode 100644
index a2a83cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_1 {
- public char st_i1;
- protected char st_p1;
- private char st_pvt1;
-
- public void run() {
- st_i1 = 77;
- }
-
- public char getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.d
deleted file mode 100644
index 466cad9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_10.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_10
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_10.st_i1N C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.java
deleted file mode 100644
index 2e2c554..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.d
deleted file mode 100644
index cd32504..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_11.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_char/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_char/TestStubs/<init>()V
-
- const v1, 1
- iput-char v1, v0, dot.junit.opcodes.iput_char.TestStubs.TestStubFieldFinal C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.java
deleted file mode 100644
index 629d319..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.d
deleted file mode 100644
index 9aeb2cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_12.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_12
-.super java/lang/Object
-
-.field public final st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_12.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.java
deleted file mode 100644
index b20146a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_12 {
- public char st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.d
deleted file mode 100644
index 9cbce64..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_13.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_13
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 0
- const v1, 77
- iput-char v1, v0, dot.junit.opcodes.iput_char.d.T_iput_char_13.st_i1 C
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.java
deleted file mode 100644
index 5f15efc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.d
deleted file mode 100644
index 71dca61..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_14.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_14
-.super dot/junit/opcodes/iput_char/d/T_iput_char_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_char/d/T_iput_char_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()C
-.limit regs 2
-
- iget-char v0, v1, dot.junit.opcodes.iput_char.d.T_iput_char_1.st_p1 C
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_1.st_p1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.java
deleted file mode 100644
index a55800a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_14 extends T_iput_char_1{
-
- public void run() {
- st_p1 = 77;
- }
-
- public char getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.d
deleted file mode 100644
index 4cccb49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_15.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_15
-.super dot/junit/opcodes/iput_char/d/T_iput_char_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_char/d/T_iput_char_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_1.st_pvt1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.java
deleted file mode 100644
index 9419df4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.d
deleted file mode 100644
index 61e503d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_17.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_17
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_17.st_i1 C
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.java
deleted file mode 100644
index 41d3dfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_18.d
deleted file mode 100644
index a9d9ac9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_18.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_18
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_2.d
deleted file mode 100644
index cc8cd62..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_2.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_2
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-char v0, v2, dot.junit.opcodes.iput_char.d.T_iput_char_4.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_20.d
deleted file mode 100644
index 5aa31b2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_20.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-char v3, v3, dot.junit.opcodes.iput_char.d.T_iput_char_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_21.d
deleted file mode 100644
index b9f7cc6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_21.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_21
-.super java/lang/Object
-
-.field public st_s S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 12
- iput-char v0, v3, dot.junit.opcodes.iput_char.d.T_iput_char_21.st_s S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_22.d
deleted file mode 100644
index ca94dbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_22.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_22
-.super java/lang/Object
-
-.field public st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-char v0, v3, dot.junit.opcodes.iput_char.d.T_iput_char_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_23.d
deleted file mode 100644
index 3494a90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_23.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_23
-.super java/lang/Object
-
-.field public st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-char v0, v3, dot.junit.opcodes.iput_char.d.T_iput_char_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_24.d
deleted file mode 100644
index d148a4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_24.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_24
-.super java/lang/Object
-
-.field public st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-char v0, v3, dot.junit.opcodes.iput_char.d.T_iput_char_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.d
deleted file mode 100644
index 05233a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_3.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_3
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- iput-char v0, v2, dot.junit.opcodes.iput_char.d.T_iput_char_3.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.dfh
deleted file mode 100644
index 95d1306..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_char/d/T_iput_char_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_char/d/T_iput_char_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : bfb944c4
- C4 44 B9 BF
-// parsed: offset 12, len 20: signature : 661f...6c76
- 66 1F 6A C5 E6 6E 82 B7 E8 AC B8 D2 AC 01 D4 58 34 56 6C 76
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "C"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/iput_char/d/T_iput_char_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 346 (0x00015a) "Ljava/lang/Object;"
- 5A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 366 (0x00016e) "T_iput_char_3.java"
- 6E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 386 (0x000182) "V"
- 82 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "run"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 394 (0x00018a) "st_i1"
- 8A 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "C"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iput_char/d/T_iput_char_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iput_char/d/T_iput_char_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iput_char_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 401 (0x000191)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 91 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput_char.d.T_iput_char_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput_char.d.T_iput_char_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: iput-char v0, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_3;.st_i1:C // field@0000
-//@mod 5E 20 00 00
- 5E 20 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "C"
- 01 43 00
-// parsed: offset 299, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iput_char/d/T_iput_char_3;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 5F 63 68 61 72 2F 64 2F 54 5F 69 70 75 74 5F 63 68 61 72 5F 33 3B 00
-// parsed: offset 346, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [4] "T_iput_char_3.java"
- 12 54 5F 69 70 75 74 5F 63 68 61 72 5F 33 2E 6A 61 76 61 00
-// parsed: offset 386, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 389, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 394, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput_char/d/T_iput_char_3;"
- // parsed: offset 401, len 1: static_fields_size: 0
- 00
- // parsed: offset 402, len 1: instance_fields_size: 1
- 01
- // parsed: offset 403, len 1: direct_methods_size: 1
- 01
- // parsed: offset 404, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 405, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 406, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 408, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 411, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 413, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 414, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 415, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 417, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 401 (0x000191)
- 00 20 00 00 01 00 00 00 91 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_30.d
deleted file mode 100644
index 8182241..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_30.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_30
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput_char/d/T_iput_char_30
- const v1, 0
- iput-char v1, v0, dot.junit.opcodes.iput_char.d.T_iput_char_30.st_i1 C
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_4.d
deleted file mode 100644
index 6f78812..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_4.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_4
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-char v3, v2, dot.junit.opcodes.iput_char.d.T_iput_char_4.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_6.d
deleted file mode 100644
index 5614d67..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_6.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_6
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- iput-char v0, v2, dot.junit.opcodes.iput_char.d.T_iput_char_6.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.d
deleted file mode 100644
index 13f4e50..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_7.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_7
-.super java/lang/Object
-
-.field public static st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_7.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.java
deleted file mode 100644
index 4e148d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.d
deleted file mode 100644
index 95616a6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_8.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_char/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_char/TestStubs/<init>()V
-
- const v1, 0
- iput-char v1, v0, dot.junit.opcodes.iput_char.TestStubs.TestStubField C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.java
deleted file mode 100644
index 186ce0b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.d
deleted file mode 100644
index d2efaae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_char_9.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_9
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-char v1, v2, dot.junit.opcodes.iput_char.d.T_iput_char_9noclass.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.java
deleted file mode 100644
index 3cb3667..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_char.d;
-
-public class T_iput_char_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/TestStubs.java
deleted file mode 100644
index d8354b2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object;
-
-public class TestStubs {
- // used by testVFE9
- protected Object TestStubField = null;
-
- // used by testE5
- public final Object TestStubFieldFinal = null;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/Test_iput_object.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/Test_iput_object.java
deleted file mode 100644
index e2f8fa4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/Test_iput_object.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput_object.d.T_iput_object_1;
-import dot.junit.opcodes.iput_object.d.T_iput_object_10;
-import dot.junit.opcodes.iput_object.d.T_iput_object_11;
-import dot.junit.opcodes.iput_object.d.T_iput_object_12;
-import dot.junit.opcodes.iput_object.d.T_iput_object_13;
-import dot.junit.opcodes.iput_object.d.T_iput_object_14;
-import dot.junit.opcodes.iput_object.d.T_iput_object_15;
-import dot.junit.opcodes.iput_object.d.T_iput_object_17;
-import dot.junit.opcodes.iput_object.d.T_iput_object_7;
-import dot.junit.opcodes.iput_object.d.T_iput_object_8;
-import dot.junit.opcodes.iput_object.d.T_iput_object_9;
-
-public class Test_iput_object extends DxTestCase {
- /**
- * @title put reference into field
- */
- public void testN1() {
- T_iput_object_1 t = new T_iput_object_1();
- assertEquals(null, t.st_i1);
- t.run();
- assertEquals(t, t.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_iput_object_12 t = new T_iput_object_12();
- assertEquals(null, t.st_i1);
- t.run();
- assertEquals(t, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_1
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_14
- T_iput_object_14 t = new T_iput_object_14();
- assertEquals(null, t.getProtectedField());
- t.run();
- assertEquals(t, t.getProtectedField());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_object_13 t = new T_iput_object_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title put object into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_object_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A11
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_iput_object_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput_object.TestStubs
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_8
- try {
- new T_iput_object_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_object_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_object_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_1
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_15
- try {
- new T_iput_object_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput-object shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title assignment incompatible references
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-object shall not work for char fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-object shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-object shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-object shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-object shall not work for short fields
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.iput_object.TestStubs
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_11
- try {
- new T_iput_object_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_1.d
deleted file mode 100644
index 6a9215e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_1.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_1.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_1
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-.field protected st_p1 Ljava/lang/Object;
-.field private st_pvt1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()Ljava/lang/Object;
-.limit regs 2
-
- iget-object v0, v1, dot.junit.opcodes.iput_object.d.T_iput_object_1.st_pvt1 Ljava/lang/Object;
- return-object v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_1.st_i1 Ljava/lang/Object;
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_1.java
deleted file mode 100644
index fdedfda..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_1 {
- public Object st_i1;
- protected Object st_p1;
- private Object st_pvt1;
-
- public void run() {
- st_i1 = this;
- }
-
- public Object getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_10.d
deleted file mode 100644
index 92f9cff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_10.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_10
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_10.st_i1N Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_10.java
deleted file mode 100644
index 01e9cb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.d
deleted file mode 100644
index f75accc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_11.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_object/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_object/TestStubs/<init>()V
-
- iput-object v2, v0, dot.junit.opcodes.iput_object.TestStubs.TestStubFieldFinal Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.java
deleted file mode 100644
index 03c14d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_12.d
deleted file mode 100644
index 69f1309..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_12.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_12
-.super java/lang/Object
-
-.field public final st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_12.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_12.java
deleted file mode 100644
index 4a6da45..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_12 {
- public Object st_i1;
-
- public void run() {
- st_i1 = this;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_13.d
deleted file mode 100644
index f282745..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_13.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_13.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_13
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 0
- iput-object v2, v0, dot.junit.opcodes.iput_object.d.T_iput_object_13.st_i1 Ljava/lang/Object;
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_13.java
deleted file mode 100644
index 334f14e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_13.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-
-public class T_iput_object_13 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.d
deleted file mode 100644
index 4e420fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_14.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_14
-.super dot/junit/opcodes/iput_object/d/T_iput_object_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_object/d/T_iput_object_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()Ljava/lang/Object;
-.limit regs 2
-
- iget-object v0, v1, dot.junit.opcodes.iput_object.d.T_iput_object_1.st_p1 Ljava/lang/Object;
- return-object v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_1.st_p1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.java
deleted file mode 100644
index 2bc9c2a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_14 extends T_iput_object_1{
-
- public void run() {
- st_p1 = this;
- }
-
- public Object getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.d
deleted file mode 100644
index 35aeab9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_15.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_15
-.super dot/junit/opcodes/iput_object/d/T_iput_object_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_object/d/T_iput_object_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_1.st_pvt1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.java
deleted file mode 100644
index 84667f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.d
deleted file mode 100644
index 71eb363..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_17.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_17
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_17.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.java
deleted file mode 100644
index 6db4b58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_18.d
deleted file mode 100644
index 56d8da8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_18.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_18.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_18
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_2.d
deleted file mode 100644
index 805388f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_2.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_2
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1234
- iput-object v0, v2, dot.junit.opcodes.iput_object.d.T_iput_object_2.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_20.d
deleted file mode 100644
index a9b90be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_20.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/String;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-object v3, v3, dot.junit.opcodes.iput_object.d.T_iput_object_20.st_o Ljava/lang/String;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_21.d
deleted file mode 100644
index 19aa1cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_21.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_21
-.super java/lang/Object
-
-.field public st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-object v3, v3, dot.junit.opcodes.iput_object.d.T_iput_object_21.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_22.d
deleted file mode 100644
index 8d7272e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_22.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_22
-.super java/lang/Object
-
-.field public st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-object v3, v3, dot.junit.opcodes.iput_object.d.T_iput_object_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_23.d
deleted file mode 100644
index 296a14b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_23.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_23
-.super java/lang/Object
-
-.field public st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-object v3, v3, dot.junit.opcodes.iput_object.d.T_iput_object_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_24.d
deleted file mode 100644
index 51bbb2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_24.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_24
-.super java/lang/Object
-
-.field public st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-object v3, v3, dot.junit.opcodes.iput_object.d.T_iput_object_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_3.d
deleted file mode 100644
index fa05a78..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_3.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_3
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_3.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_3.dfh
deleted file mode 100644
index 8a922e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_3.dfh
+++ /dev/null
@@ -1,253 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_object/d/T_iput_object_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_object/d/T_iput_object_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : e2b84420
- 20 44 B8 E2
-// parsed: offset 12, len 20: signature : 498f...47af
- 49 8F 16 1B 5F D7 3D 35 18 CB F9 59 65 B7 A8 60 6A 19 47 AF
-// parsed: offset 32, len 4: file_size : 544
- 20 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 408 (0x000198)
- 98 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 7
- 07 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 140 (0x00008c)
- 8C 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 164 (0x0000a4)
- A4 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 196 (0x0000c4)
- C4 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 228 (0x0000e4)
- E4 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 276 (0x000114) "<init>"
- 14 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 284 (0x00011c) "Ldot/junit/opcodes/iput_object/d/T_iput_object_3;"
- 1C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 335 (0x00014f) "Ljava/lang/Object;"
- 4F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 355 (0x000163) "T_iput_object_3.java"
- 63 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 377 (0x000179) "V"
- 79 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 380 (0x00017c) "run"
- 7C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 385 (0x000181) "st_i1"
- 81 01 00 00
-
-// type_ids:
-// parsed: offset 140, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/iput_object/d/T_iput_object_3;"
- 01 00 00 00
-// parsed: offset 144, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 148, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 152, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 164, len 8: [0] class_idx: 0 (0x000000) type_idx: 1 (0x000001) name_idx: 6 (0x000006) "st_i1"
- 00 00 01 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 172, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 180, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 188, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 196, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/iput_object/d/T_iput_object_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_iput_object_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 392 (0x000188)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 88 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput_object.d.T_iput_object_3.<init>"
- // parsed: offset 228, len 2: registers_size: 1
- 01 00
- // parsed: offset 230, len 2: ins_size: 1
- 01 00
- // parsed: offset 232, len 2: outs_size: 1
- 01 00
- // parsed: offset 234, len 2: tries_size: 0
- 00 00
- // parsed: offset 236, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 240, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 244, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 250, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput_object.d.T_iput_object_3.run"
- // parsed: offset 252, len 2: registers_size: 3
- 03 00
- // parsed: offset 254, len 2: ins_size: 1
- 01 00
- // parsed: offset 256, len 2: outs_size: 0
- 00 00
- // parsed: offset 258, len 2: tries_size: 0
- 00 00
- // parsed: offset 260, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 264, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 268, len 4: |0000: iput-object v2, v2, Ldot/junit/opcodes/iput_object/d/T_iput_object_3;.st_i1:Ljava/lang/Object; // field@0000
-//@mod 5B 22 00 00
- 5B 22 00 01
- // parsed: offset 272, len 2: |0002: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 274, len 2: PADDING
- 00 00
-// parsed: offset 276, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 284, len 51: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/iput_object/d/T_iput_object_3;"
- 31 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 5F 6F 62 6A 65 63 74 2F 64 2F 54 5F 69 70 75 74 5F 6F 62 6A 65 63 74 5F 33 3B 00
-// parsed: offset 335, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 355, len 22: TYPE_STRING_DATA_ITEM [3] "T_iput_object_3.java"
- 14 54 5F 69 70 75 74 5F 6F 62 6A 65 63 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 377, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 380, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// parsed: offset 385, len 7: TYPE_STRING_DATA_ITEM [6] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput_object/d/T_iput_object_3;"
- // parsed: offset 392, len 1: static_fields_size: 0
- 00
- // parsed: offset 393, len 1: instance_fields_size: 1
- 01
- // parsed: offset 394, len 1: direct_methods_size: 1
- 01
- // parsed: offset 395, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 396, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 397, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 398, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 399, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 402, len 2: code_off: 228 (0x0000e4)
- E4 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 404, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 405, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 406, len 2: code_off: 252 (0x0000fc)
- FC 01
-// map_list:
- // parsed: offset 408, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 412, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 424, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 7
- // offset: 112 (0x000070)
- 01 00 00 00 07 00 00 00 70 00 00 00
- // parsed: offset 436, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 140 (0x00008c)
- 02 00 00 00 03 00 00 00 8C 00 00 00
- // parsed: offset 448, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 152 (0x000098)
- 03 00 00 00 01 00 00 00 98 00 00 00
- // parsed: offset 460, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 164 (0x0000a4)
- 04 00 00 00 01 00 00 00 A4 00 00 00
- // parsed: offset 472, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 172 (0x0000ac)
- 05 00 00 00 03 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 196 (0x0000c4)
- 06 00 00 00 01 00 00 00 C4 00 00 00
- // parsed: offset 496, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 228 (0x0000e4)
- 01 20 00 00 02 00 00 00 E4 00 00 00
- // parsed: offset 508, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 7
- // offset: 276 (0x000114)
- 02 20 00 00 07 00 00 00 14 01 00 00
- // parsed: offset 520, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 392 (0x000188)
- 00 20 00 00 01 00 00 00 88 01 00 00
- // parsed: offset 532, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 408 (0x000198)
- 00 10 00 00 01 00 00 00 98 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_30.d
deleted file mode 100644
index ace5b2c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_30.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_30
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput_object/d/T_iput_object_30
- const v1, 0
- iput-object v1, v0, dot.junit.opcodes.iput_object.d.T_iput_object_30.st_i1 Ljava/lang/Object;
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_4.d
deleted file mode 100644
index 8906abe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_4.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_4
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v3, v2, dot.junit.opcodes.iput_object.d.T_iput_object_4.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_6.d
deleted file mode 100644
index 5e9f811..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_6.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_6
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v3, v2, dot.junit.opcodes.iput_object.d.T_iput_object_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_7.d
deleted file mode 100644
index 25768ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_7.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_7
-.super java/lang/Object
-
-.field public static st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_7.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_7.java
deleted file mode 100644
index 60bba2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.d
deleted file mode 100644
index 971dec4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_8.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_object/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_object/TestStubs/<init>()V
-
- iput-object v2, v0, dot.junit.opcodes.iput_object.TestStubs.TestStubField Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.java
deleted file mode 100644
index f104e78..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_9.d
deleted file mode 100644
index 3fd712b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_object_9.java
-.class public dot.junit.opcodes.iput_object.d.T_iput_object_9
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-object v2, v2, dot.junit.opcodes.iput_object.d.T_iput_object_9noclass.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_9.java
deleted file mode 100644
index 7b53911..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_object/d/T_iput_object_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_object.d;
-
-public class T_iput_object_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/TestStubs.java
deleted file mode 100644
index 8cee31e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short;
-
-public class TestStubs {
- // used by testVFE9
- protected short TestStubField = 77;
-
- // used by testE5
- public final short TestStubFieldFinal = 77;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/Test_iput_short.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/Test_iput_short.java
deleted file mode 100644
index 0ea32e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/Test_iput_short.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput_short.d.T_iput_short_1;
-import dot.junit.opcodes.iput_short.d.T_iput_short_10;
-import dot.junit.opcodes.iput_short.d.T_iput_short_11;
-import dot.junit.opcodes.iput_short.d.T_iput_short_12;
-import dot.junit.opcodes.iput_short.d.T_iput_short_13;
-import dot.junit.opcodes.iput_short.d.T_iput_short_14;
-import dot.junit.opcodes.iput_short.d.T_iput_short_15;
-import dot.junit.opcodes.iput_short.d.T_iput_short_17;
-import dot.junit.opcodes.iput_short.d.T_iput_short_7;
-import dot.junit.opcodes.iput_short.d.T_iput_short_8;
-import dot.junit.opcodes.iput_short.d.T_iput_short_9;
-
-public class Test_iput_short extends DxTestCase {
- /**
- * @title put short into field
- */
- public void testN1() {
- T_iput_short_1 t = new T_iput_short_1();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_iput_short_12 t = new T_iput_short_12();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_1
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_14
- T_iput_short_14 t = new T_iput_short_14();
- assertEquals(0, t.getProtectedField());
- t.run();
- assertEquals(77, t.getProtectedField());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_short_13 t = new T_iput_short_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title put short into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_short_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B14
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A11
- * @title Attempt to set static field.
- */
- public void testVFE8() {
- try {
- new T_iput_short_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput_short.TestStubs
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_8
- try {
- new T_iput_short_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_short_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_short_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_1
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_15
- try {
- new T_iput_short_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput-short shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-short shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-short shall not work for char fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-short shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-short shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-short shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.iput_short.TestStubs
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_11
- try {
- new T_iput_short_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.d
deleted file mode 100644
index 8aca472..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_1.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_1
-.super java/lang/Object
-
-.field public st_i1 S
-.field protected st_p1 S
-.field private st_pvt1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()S
-.limit regs 2
-
- iget-short v0, v1, dot.junit.opcodes.iput_short.d.T_iput_short_1.st_pvt1 S
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_1.st_i1 S
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.java
deleted file mode 100644
index a804c96..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_1 {
- public short st_i1;
- protected short st_p1;
- private short st_pvt1;
-
- public void run() {
- st_i1 = 77;
- }
-
- public short getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.d
deleted file mode 100644
index 7feaba8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_10.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_10
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_10.st_i1N S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.java
deleted file mode 100644
index eb01ab1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.d
deleted file mode 100644
index 23539d3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_11.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_short/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_short/TestStubs/<init>()V
-
- const v1, 1
- iput-short v1, v0, dot.junit.opcodes.iput_short.TestStubs.TestStubFieldFinal S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.java
deleted file mode 100644
index dc23c74..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.d
deleted file mode 100644
index b0f2f15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_12.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_12
-.super java/lang/Object
-
-.field public final st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_12.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.java
deleted file mode 100644
index eaacd89..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_12 {
- public short st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.d
deleted file mode 100644
index 4472907..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_13.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_13
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 3
-
- const v0, 0
- const v1, 77
- iput-short v1, v0, dot.junit.opcodes.iput_short.d.T_iput_short_13.st_i1 S
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.java
deleted file mode 100644
index 2ba3c63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-
-public class T_iput_short_13 {
-
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.d
deleted file mode 100644
index f7b07c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_14.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_14
-.super dot/junit/opcodes/iput_short/d/T_iput_short_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_short/d/T_iput_short_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()S
-.limit regs 2
-
- iget-short v0, v1, dot.junit.opcodes.iput_short.d.T_iput_short_1.st_p1 S
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_1.st_p1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.java
deleted file mode 100644
index 8a33e07..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_14 extends T_iput_short_1{
-
- public void run() {
- st_p1 = 77;
- }
-
- public short getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.d
deleted file mode 100644
index 5732b91..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_15.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_15
-.super dot/junit/opcodes/iput_short/d/T_iput_short_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_short/d/T_iput_short_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_1.st_pvt1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.java
deleted file mode 100644
index 17398b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.d
deleted file mode 100644
index bd8966a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_17.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_17
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_17.st_i1 S
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.java
deleted file mode 100644
index b89d34b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_18.d
deleted file mode 100644
index 5d543c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_18.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_18
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_2.d
deleted file mode 100644
index ae98945..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_2.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_2
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-short v0, v2, dot.junit.opcodes.iput_short.d.T_iput_short_4.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_20.d
deleted file mode 100644
index b7524dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_20.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- iput-short v3, v3, dot.junit.opcodes.iput_short.d.T_iput_short_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_21.d
deleted file mode 100644
index 7b80f03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_21.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_21
-.super java/lang/Object
-
-.field public st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 12
- iput-short v0, v3, dot.junit.opcodes.iput_short.d.T_iput_short_21.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_22.d
deleted file mode 100644
index 4f969d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_22.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_22
-.super java/lang/Object
-
-.field public st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-short v0, v3, dot.junit.opcodes.iput_short.d.T_iput_short_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_23.d
deleted file mode 100644
index 6f2cdc1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_23.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_23
-.super java/lang/Object
-
-.field public st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-short v0, v3, dot.junit.opcodes.iput_short.d.T_iput_short_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_24.d
deleted file mode 100644
index 326cd78..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_24.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_24
-.super java/lang/Object
-
-.field public st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- iput-short v0, v3, dot.junit.opcodes.iput_short.d.T_iput_short_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.d
deleted file mode 100644
index 0a091e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_3.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_3
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- iput-short v0, v2, dot.junit.opcodes.iput_short.d.T_iput_short_3.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.dfh
deleted file mode 100644
index f055d5f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.dfh
+++ /dev/null
@@ -1,259 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_short/d/T_iput_short_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/iput_short/d/T_iput_short_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 69af47b5
- B5 47 AF 69
-// parsed: offset 12, len 20: signature : 8879...c4a0
- 88 79 16 98 CF A1 69 7E 3C 6B E3 73 9E F7 E8 E4 22 93 C4 A0
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "Ldot/junit/opcodes/iput_short/d/T_iput_short_3;"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "Ljava/lang/Object;"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 365 (0x00016d) "S"
- 6D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 368 (0x000170) "T_iput_short_3.java"
- 70 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 389 (0x000185) "V"
- 85 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 392 (0x000188) "run"
- 88 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 397 (0x00018d) "st_i1"
- 8D 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/iput_short/d/T_iput_short_3;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "S"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 0 (0x000000) type_idx: 2 (0x000002) name_idx: 7 (0x000007) "st_i1"
- 00 00 02 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 00 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/iput_short/d/T_iput_short_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iput_short_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 404 (0x000194)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 94 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput_short.d.T_iput_short_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput_short.d.T_iput_short_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: iput-short v0, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_3;.st_i1:S // field@0000
-//@mod 5F 20 00 00
- 5F 20 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 49: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/iput_short/d/T_iput_short_3;"
- 2F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 5F 73 68 6F 72 74 2F 64 2F 54 5F 69 70 75 74 5F 73 68 6F 72 74 5F 33 3B 00
-// parsed: offset 345, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 365, len 3: TYPE_STRING_DATA_ITEM [3] "S"
- 01 53 00
-// parsed: offset 368, len 21: TYPE_STRING_DATA_ITEM [4] "T_iput_short_3.java"
- 13 54 5F 69 70 75 74 5F 73 68 6F 72 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 389, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 392, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 397, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput_short/d/T_iput_short_3;"
- // parsed: offset 404, len 1: static_fields_size: 0
- 00
- // parsed: offset 405, len 1: instance_fields_size: 1
- 01
- // parsed: offset 406, len 1: direct_methods_size: 1
- 01
- // parsed: offset 407, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 408, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 409, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 410, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 411, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 414, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 417, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 418, len 2: code_off: 260 (0x000104)
- 84 02
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 404 (0x000194)
- 00 20 00 00 01 00 00 00 94 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_30.d
deleted file mode 100644
index 51d2ea8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_30.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_30
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput_short/d/T_iput_short_30
- const v1, 0
- iput-short v1, v0, dot.junit.opcodes.iput_short.d.T_iput_short_30.st_i1 S
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_4.d
deleted file mode 100644
index f201a30..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_4.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_4
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-short v3, v2, dot.junit.opcodes.iput_short.d.T_iput_short_4.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_6.d
deleted file mode 100644
index ba79d41..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_6.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_6
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- iput-short v0, v2, dot.junit.opcodes.iput_short.d.T_iput_short_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.d
deleted file mode 100644
index b395108..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_7.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_7
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_7.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.java
deleted file mode 100644
index 6969f12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.d
deleted file mode 100644
index 05b5100..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_8.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- new-instance v0, Ldot/junit/opcodes/iput_short/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_short/TestStubs/<init>()V
-
- const v1, 0
- iput-short v1, v0, dot.junit.opcodes.iput_short.TestStubs.TestStubField S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.java
deleted file mode 100644
index 689c54b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.d
deleted file mode 100644
index 1a1555e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_short_9.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_9
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- iput-short v1, v2, dot.junit.opcodes.iput_short.d.T_iput_short_9noclass.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.java
deleted file mode 100644
index 7f81b96..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_short.d;
-
-public class T_iput_short_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/TestStubs.java
deleted file mode 100644
index 617b87f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide;
-
-public class TestStubs {
- // used by testVFE9
- protected long TestStubField = 0;
-
- // used by testE5
- public final long TestStubFieldFinal = 0;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java
deleted file mode 100644
index a61bb70..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_1;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_10;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_11;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_12;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_13;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_14;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_15;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_17;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_5;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_7;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_8;
-import dot.junit.opcodes.iput_wide.d.T_iput_wide_9;
-
-public class Test_iput_wide extends DxTestCase {
- /**
- * @title put long into field
- */
- public void testN1() {
- T_iput_wide_1 t = new T_iput_wide_1();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(778899112233l, t.st_i1);
- }
-
- /**
- * @title put double into field
- */
- public void testN2() {
- T_iput_wide_5 t = new T_iput_wide_5();
- assertEquals(0.0d, t.st_i1);
- t.run();
- assertEquals(0.5d, t.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN3() {
- T_iput_wide_12 t = new T_iput_wide_12();
- assertEquals(0, t.st_i1);
- t.run();
- assertEquals(77, t.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_1
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_14
- T_iput_wide_14 t = new T_iput_wide_14();
- assertEquals(0, t.getProtectedField());
- t.run();
- assertEquals(77, t.getProtectedField());
- }
-
- /**
- * @title expected NullPointerException
- */
- public void testE2() {
- T_iput_wide_13 t = new T_iput_wide_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A11
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B14
- * @title put int into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_iput_wide_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- *
- * @constraint B14
- * @title type of field doesn't match opcode - attempt to modify float
- * field with double-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A11
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_iput_wide_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint B12
- * @title Attempt to modify inaccessible protected field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.iput_wide.TestStubs
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_8
- try {
- new T_iput_wide_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_iput_wide_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_iput_wide_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_1
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_15
- try {
- new T_iput_wide_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title iput-wide shall not work for single-width numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-wide shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-wide shall not work for char fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-wide shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-wide shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-wide shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title iput-wide shall not work for short fields
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
- */
- public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testE5() {
- //@uses dot.junit.opcodes.iput_wide.TestStubs
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_11
- try {
- new T_iput_wide_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_1.d
deleted file mode 100644
index cae692f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_1.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_1
-.super java/lang/Object
-
-.field public st_i1 J
-.field protected st_p1 J
-.field private st_pvt1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public getPvtField()J
-.limit regs 3
-
- iget-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_1.st_pvt1 J
- return-wide v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 778899112233
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_1.st_i1 J
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_1.java
deleted file mode 100644
index be11462..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_1 {
- public long st_i1;
- protected long st_p1;
- private long st_pvt1;
-
- public void run() {
- st_i1 = 778899112233l;
- }
-
- public long getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.d
deleted file mode 100644
index 1ba4cac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_10.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_10
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_10.st_i1N J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.java
deleted file mode 100644
index 9653b55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.d
deleted file mode 100644
index d3401d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_11.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, Ldot/junit/opcodes/iput_wide/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_wide/TestStubs/<init>()V
-
- const-wide v1, 1
- iput-wide v1, v0, dot.junit.opcodes.iput_wide.TestStubs.TestStubFieldFinal J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.java
deleted file mode 100644
index 327d5bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.d
deleted file mode 100644
index a386a54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_12.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_12
-.super java/lang/Object
-
-.field public final st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 77
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_12.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.java
deleted file mode 100644
index d2d6998..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_12 {
- public long st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_13.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_13.d
deleted file mode 100644
index cdf7fe6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_13.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_13.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_13
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v2, 0
- const-wide v0, 778899112233
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_13.st_i1 J
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_13.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_13.java
deleted file mode 100644
index 6053aec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_13.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-
-public class T_iput_wide_13 {
-
- public void run() {
-
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.d
deleted file mode 100644
index 22bafcf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_14.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_14
-.super dot/junit/opcodes/iput_wide/d/T_iput_wide_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_wide/d/T_iput_wide_1/<init>()V
- return-void
-.end method
-
-.method public getProtectedField()J
-.limit regs 2
-
- iget-wide v0, v1, dot.junit.opcodes.iput_wide.d.T_iput_wide_1.st_p1 J
- return-wide v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 77
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_1.st_p1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.java
deleted file mode 100644
index f0fb8d3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_14 extends T_iput_wide_1{
-
- public void run() {
- st_p1 = 77;
- }
-
- public long getProtectedField(){
- return st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.d
deleted file mode 100644
index 4e8b2ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_15.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_15
-.super dot/junit/opcodes/iput_wide/d/T_iput_wide_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/iput_wide/d/T_iput_wide_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_1.st_pvt1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.java
deleted file mode 100644
index 9818c22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.d
deleted file mode 100644
index 058d1dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_17.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_17
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_17.st_i1 J
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.java
deleted file mode 100644
index 60c005e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_18.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_18.d
deleted file mode 100644
index 1818bed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_18.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_18
-.super java/lang/Object
-
-.field public st_i1 F
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1.0
- iput-wide v1, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_18.st_i1 F
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_2.d
deleted file mode 100644
index 8d6dc36..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_2.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_2
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_4.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_20.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_20.d
deleted file mode 100644
index e0efb25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_20.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_20.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_20
-.super java/lang/Object
-
-.field public st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const-wide v0, 0
-
- iput-wide v0, v3, dot.junit.opcodes.iput_wide.d.T_iput_wide_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_21.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_21.d
deleted file mode 100644
index 064a9a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_21.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_21
-.super java/lang/Object
-
-.field public st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 12
- iput-wide v0, v3, dot.junit.opcodes.iput_wide.d.T_iput_wide_21.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_22.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_22.d
deleted file mode 100644
index 80a827d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_22.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_22
-.super java/lang/Object
-
-.field public st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 1
- iput-wide v0, v3, dot.junit.opcodes.iput_wide.d.T_iput_wide_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_23.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_23.d
deleted file mode 100644
index d37bbd0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_23.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_23
-.super java/lang/Object
-
-.field public st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 1
- iput-wide v0, v3, dot.junit.opcodes.iput_wide.d.T_iput_wide_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_24.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_24.d
deleted file mode 100644
index 3f0102f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_24.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_24
-.super java/lang/Object
-
-.field public st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 1
- iput-wide v0, v3, dot.junit.opcodes.iput_wide.d.T_iput_wide_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.d
deleted file mode 100644
index fc4dc02..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_3.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_3
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_3.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.dfh
deleted file mode 100644
index a0ada5a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dot/junit/opcodes/iput_wide/d/T_iput_wide_3.dex'...
-// Opened 'dot/junit/opcodes/iput_wide/d/T_iput_wide_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 71754517
- 17 45 75 71
-// parsed: offset 12, len 20: signature : e67a...82a9
- E6 7A EF BD 44 34 8E F6 ED DF 42 B2 5F 27 17 2B 1D B9 82 A9
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 292 (0x000124) "<init>"
- 24 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 300 (0x00012c) "J"
- 2C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 303 (0x00012f) "Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;"
- 2F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 350 (0x00015e) "Ljava/lang/Object;"
- 5E 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 370 (0x000172) "T_iput_wide_3.java"
- 72 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 398 (0x00018e) "st_i1"
- 8E 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "J"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_iput_wide_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 405 (0x000195)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 95 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.iput_wide.d.T_iput_wide_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.iput_wide.d.T_iput_wide_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 276, len 10: |0000: const-wide v0, #double 0.000000 // #0x0000000000000001 long
- 18 00 01 00 00 00 00 00 00 00
- // parsed: offset 286, len 4: |0005: iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;.st_i1:J // field@0000
-//@mod 5A 20 00 00
- 5A 20 00 01
- // parsed: offset 290, len 2: |0007: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 292, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 300, len 3: TYPE_STRING_DATA_ITEM [1] "J"
- 01 4A 00
-// parsed: offset 303, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 69 70 75 74 5F 77 69 64 65 2F 64 2F 54 5F 69 70 75 74 5F 77 69 64 65 5F 33 3B 00
-// parsed: offset 350, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 370, len 20: TYPE_STRING_DATA_ITEM [4] "T_iput_wide_3.java"
- 12 54 5F 69 70 75 74 5F 77 69 64 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 398, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;"
- // parsed: offset 405, len 1: static_fields_size: 0
- 00
- // parsed: offset 406, len 1: instance_fields_size: 1
- 01
- // parsed: offset 407, len 1: direct_methods_size: 1
- 01
- // parsed: offset 408, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // field [0]:
- // parsed: offset 409, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 410, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // direct_methods:
- // method [0]:
- // parsed: offset 411, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 412, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 415, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 417, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 418, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 419, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 421, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 292 (0x000124)
- 02 20 00 00 08 00 00 00 24 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 405 (0x000195)
- 00 20 00 00 01 00 00 00 95 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_30.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_30.d
deleted file mode 100644
index 9513dc8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_30.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_30.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_30
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, dot/junit/opcodes/iput_wide/d/T_iput_wide_30
- const-wide v1, 0
- iput-wide v1, v0, dot.junit.opcodes.iput_wide.d.T_iput_wide_30.st_i1 J
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_4.d
deleted file mode 100644
index 6036cc6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_4.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_4
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- iput-wide v3, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_4.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.d
deleted file mode 100644
index 3c1d9ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_5.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_5
-.super java/lang/Object
-
-.field public st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 0.5
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_5.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.java
deleted file mode 100644
index a508e8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_5 {
- public double st_i1;
-
- public void run() {
- st_i1 = 0.5d;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_6.d
deleted file mode 100644
index 31f4f12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_6.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_6
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.d
deleted file mode 100644
index df5079c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_7.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_7
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 0
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_7.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.java
deleted file mode 100644
index e476c01..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.d
deleted file mode 100644
index 12a0d92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_8.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
- new-instance v0, Ldot/junit/opcodes/iput_wide/TestStubs;
- invoke-direct {v0}, dot/junit/opcodes/iput_wide/TestStubs/<init>()V
-
- const-wide v1, 0
- iput-wide v1, v0, dot.junit.opcodes.iput_wide.TestStubs.TestStubField J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.java
deleted file mode 100644
index dc2e2bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.d b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.d
deleted file mode 100644
index aecd210..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iput_wide_9.java
-.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_9
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 0
- iput-wide v0, v2, dot.junit.opcodes.iput_wide.d.T_iput_wide_9noclass.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.java b/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.java
deleted file mode 100644
index c9d1da2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.iput_wide.d;
-
-public class T_iput_wide_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java
deleted file mode 100644
index fb55b8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.long_to_double.d.T_long_to_double_1;
-import dot.junit.opcodes.long_to_double.d.T_long_to_double_6;
-
-public class Test_long_to_double extends DxTestCase {
- /**
- * @title Argument = 50000000000
- */
- public void testN1() {
- T_long_to_double_1 t = new T_long_to_double_1();
- assertEquals(5.0E10d, t.run(50000000000l), 0d);
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_long_to_double_1 t = new T_long_to_double_1();
- assertEquals(1d, t.run(1l), 0d);
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_long_to_double_1 t = new T_long_to_double_1();
- assertEquals(-1d, t.run(-1l), 0d);
- }
-
- /**
- * @title Type of argument - double. Dalvik doens't distinguish 64-bits types internally,
- * so this conversion of double to double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_long_to_double_6 t = new T_long_to_double_6();
- try {
- t.run(12345);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Long.MAX_VALUE
- */
- public void testB1() {
- T_long_to_double_1 t = new T_long_to_double_1();
- assertEquals(9.223372036854776E18d, t.run(Long.MAX_VALUE), 0d);
- }
-
- /**
- * @title Argument = Long.MIN_VALUE
- */
- public void testB2() {
- T_long_to_double_1 t = new T_long_to_double_1();
- assertEquals(-9.223372036854776E18, t.run(Long.MIN_VALUE), 0d);
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_long_to_double_1 t = new T_long_to_double_1();
- assertEquals(0d, t.run(0), 0d);
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - integer
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A24
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.d
deleted file mode 100644
index d1e068c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_double_1.java
-.class public dot.junit.opcodes.long_to_double.d.T_long_to_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)D
-.limit regs 8
-
- long-to-double v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.java
deleted file mode 100644
index f1ce414..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_double.d;
-
-public class T_long_to_double_1 {
-
- public double run(long a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_2.d
deleted file mode 100644
index 3201a77..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_double_2.java
-.class public dot.junit.opcodes.long_to_double.d.T_long_to_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)D
-.limit regs 8
-
- const v6, 3.1415
- long-to-double v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_3.d
deleted file mode 100644
index 83c423c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_double_3.java
-.class public dot.junit.opcodes.long_to_double.d.T_long_to_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)D
-.limit regs 8
-
- const v6, 1234
- long-to-double v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_4.d
deleted file mode 100644
index 03bc7bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_double_4.java
-.class public dot.junit.opcodes.long_to_double.d.T_long_to_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)D
-.limit regs 8
-
- long-to-double v0, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_5.d
deleted file mode 100644
index 6656834..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_double_5.java
-.class public dot.junit.opcodes.long_to_double.d.T_long_to_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)D
-.limit regs 8
-
- long-to-double v0, v8
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.d
deleted file mode 100644
index 8e430fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_double_6.java
-.class public dot.junit.opcodes.long_to_double.d.T_long_to_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)D
-.limit regs 8
-
- long-to-double v0, v6
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.java
deleted file mode 100644
index f676c16..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_double.d;
-
-public class T_long_to_double_6 {
-
- public double run(double a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java
deleted file mode 100644
index 1e06437..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.long_to_float.d.T_long_to_float_1;
-import dot.junit.opcodes.long_to_float.d.T_long_to_float_2;
-
-public class Test_long_to_float extends DxTestCase {
- /**
- * @title Argument = 123456789012345
- */
- public void testN1() {
- T_long_to_float_1 t = new T_long_to_float_1();
- assertEquals(1.23456788E14f, t.run(123456789012345l), 0f);
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_long_to_float_1 t = new T_long_to_float_1();
- assertEquals(1f, t.run(1l), 0f);
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_long_to_float_1 t = new T_long_to_float_1();
- assertEquals(-1f, t.run(-1l), 0f);
- }
-
- /**
- * @title Type of argument - double. Dalvik doens't distinguish 64-bits types internally,
- * so this conversion of double to double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_long_to_float_2 t = new T_long_to_float_2();
- try {
- t.run(12345);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Long.MAX_VALUE
- */
- public void testB1() {
- T_long_to_float_1 t = new T_long_to_float_1();
- assertEquals(9.223372036854776E18, t.run(Long.MAX_VALUE), 0f);
- }
-
- /**
- * @title Argument = Long.MIN_VALUE
- */
- public void testB2() {
- T_long_to_float_1 t = new T_long_to_float_1();
- assertEquals(-9.223372036854776E18, t.run(Long.MIN_VALUE), 0f);
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_long_to_float_1 t = new T_long_to_float_1();
- assertEquals(0f, t.run(0l), 0f);
- }
-
-
-
-
- /**
- * @constraint B1
- * @title type of argument - integer
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A24
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.d
deleted file mode 100644
index 3f0602b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_float_1.java
-.class public dot.junit.opcodes.long_to_float.d.T_long_to_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)F
-.limit regs 8
-
- long-to-float v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.java
deleted file mode 100644
index 67eca97..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_float.d;
-
-public class T_long_to_float_1 {
-
- public float run(long a) {
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.d
deleted file mode 100644
index 0f4a557..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_float_2.java
-.class public dot.junit.opcodes.long_to_float.d.T_long_to_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)F
-.limit regs 8
-
- long-to-float v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.java
deleted file mode 100644
index 409d2ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_float.d;
-
-public class T_long_to_float_2 {
-
- public float run(double a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_3.d
deleted file mode 100644
index 002e5d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_float_3.java
-.class public dot.junit.opcodes.long_to_float.d.T_long_to_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)F
-.limit regs 8
-
- const v6, 1234
- long-to-float v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_4.d
deleted file mode 100644
index acb99d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_float_4.java
-.class public dot.junit.opcodes.long_to_float.d.T_long_to_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)F
-.limit regs 8
-
- long-to-float v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_5.d
deleted file mode 100644
index 5cb993e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_float_5.java
-.class public dot.junit.opcodes.long_to_float.d.T_long_to_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)F
-.limit regs 8
-
- long-to-float v0, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java
deleted file mode 100644
index 2440fa5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.long_to_int.d.T_long_to_int_1;
-import dot.junit.opcodes.long_to_int.d.T_long_to_int_2;
-
-public class Test_long_to_int extends DxTestCase {
- /**
- * @title Argument = 0xAAAAFFEEDDCCl
- */
- public void testN1() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(0xFFEEDDCC, t.run(0xAAAAFFEEDDCCl));
- }
-
- /**
- * @title Argument = -123456789
- */
- public void testN2() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(-123456789, t.run(-123456789l));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN3() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(1, t.run(1l));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN4() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(-1, t.run(-1l));
- }
-
- /**
- * @title Type of argument - double. Dalvik doens't distinguish 64-bits types internally,
- * so this conversion of double to int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_long_to_int_2 t = new T_long_to_int_2();
- try {
- t.run(12345);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Long.MAX_VALUE
- */
- public void testB1() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(-1, t.run(Long.MAX_VALUE));
- }
-
- /**
- * @title Argument = Long.MIN_VALUE
- */
- public void testB2() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(0, t.run(Long.MIN_VALUE));
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_long_to_int_1 t = new T_long_to_int_1();
- assertEquals(0, t.run(0l));
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.d
deleted file mode 100644
index 2f73956..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_int_1.java
-.class public dot.junit.opcodes.long_to_int.d.T_long_to_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- long-to-int v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.java
deleted file mode 100644
index 77f6c5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_int.d;
-
-public class T_long_to_int_1 {
-
- public int run(long a) {
- return (int) a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.d
deleted file mode 100644
index 1732d7f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_int_2.java
-.class public dot.junit.opcodes.long_to_int.d.T_long_to_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- long-to-int v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.java b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.java
deleted file mode 100644
index 97b9ac4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.long_to_int.d;
-
-public class T_long_to_int_2 {
-
- public int run(double a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_3.d
deleted file mode 100644
index 1d4665b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_int_3.java
-.class public dot.junit.opcodes.long_to_int.d.T_long_to_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- const v6, 1234.0
- long-to-int v0, v6
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_4.d
deleted file mode 100644
index 50e5889..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_int_4.java
-.class public dot.junit.opcodes.long_to_int.d.T_long_to_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- long-to-int v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_5.d
deleted file mode 100644
index 5b65864..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_int_5.java
-.class public dot.junit.opcodes.long_to_int.d.T_long_to_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- long-to-int v0, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_6.d
deleted file mode 100644
index ad412f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_long_to_int_6.java
-.class public dot.junit.opcodes.long_to_int.d.T_long_to_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)V
-.limit regs 8
- move v0, v7
- move v1, v7
- long-to-int v0, v0
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java
deleted file mode 100644
index 3608793..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_enter;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1;
-import dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2;
-import dot.junit.opcodes.monitor_enter.d.T_monitor_enter_3;
-
-public class Test_monitor_enter extends DxTestCase {
-
- /**
- * @title tests monitor-enter functionality
- *
- * @throws InterruptedException
- */
- public void testN1() throws InterruptedException {
- //@uses dot.junit.opcodes.monitor_enter.TestRunnable
- final T_monitor_enter_1 t1 = new T_monitor_enter_1();
- Runnable r1 = new TestRunnable(t1);
- Runnable r2 = new TestRunnable(t1);
- Thread tr1 = new Thread(r1);
- Thread tr2 = new Thread(r2);
- tr1.start();
- tr2.start();
-
- tr1.join();
- tr2.join();
- assertEquals(2, t1.counter);
- }
-
- /**
- * @title Tests behavior when monitor owned by current thread.
- *
- * @throws InterruptedException
- */
- public void testN2() throws InterruptedException {
- //@uses dot.junit.opcodes.monitor_enter.TestRunnable2
- final T_monitor_enter_2 t1 = new T_monitor_enter_2();
- Runnable r1 = new TestRunnable2(t1, 10);
- Runnable r2 = new TestRunnable2(t1, 20);
- Thread tr1 = new Thread(r1);
- Thread tr2 = new Thread(r2);
- tr1.start();
- tr2.start();
-
- tr1.join();
- tr2.join();
- assertTrue(t1.result);
- }
-
-
- /**
- * @title expected NullPointerException
- */
- public void testE1() {
- T_monitor_enter_3 t = new T_monitor_enter_3();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
-
-class TestRunnable implements Runnable {
- private T_monitor_enter_1 t1;
- TestRunnable(T_monitor_enter_1 t1) {
- this.t1 = t1;
- }
-
- public void run() {
- try {
- t1.run();
- } catch (InterruptedException e) {
- throw new RuntimeException("interrupted!");
- }
- }
-}
-
-class TestRunnable2 implements Runnable {
- private T_monitor_enter_2 t2;
- private int val;
- TestRunnable2(T_monitor_enter_2 t2, int val) {
- this.t2 = t2;
- this.val = val;
- }
-
- public void run() {
- try {
- t2.run(val);
- } catch (InterruptedException e) {
- throw new RuntimeException("interrupted!");
- }
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.d
deleted file mode 100644
index eb443b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.d
+++ /dev/null
@@ -1,63 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_1.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1
-.super java/lang/Object
-
-.field public counter I
-
-.method public <init>()V
-.limit regs 2
-
- invoke-direct {v1}, java/lang/Object/<init>()V
-
- const/4 v0, 0
-
- iput v0, v1, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1.counter I
- return-void
-.end method
-
-.method public run()V
-.limit regs 8
- monitor-enter v7
-Label8:
- iget v1, v7, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1.counter I
-
- const-wide/16 v3, 500
- invoke-static {v3, v4}, java/lang/Thread/sleep(J)V
-
- iget v2, v7, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1.counter I
-
- if-ne v1, v2, Label0
-
- add-int/lit8 v1, v1, 1
- iput v1, v7, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1.counter I
- monitor-exit v7
-Label24:
- return-void
-Label0:
- const/4 v5, -1
- iput v5, v7, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1.counter I
- monitor-exit v7
- return-void
-
-Label25:
- move-exception v3
- monitor-exit v7
- const/4 v5, -1
- iput v5, v7, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_1.counter I
- throw v3
-.catch all from Label8 to Label24 using Label25
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.java
deleted file mode 100644
index 39113fa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_enter.d;
-
-public class T_monitor_enter_1 {
- public int counter = 0;
-
- public void run() throws InterruptedException {
- synchronized(this) {
- int a = counter;
- Thread.sleep(500);
- counter = ++a;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.d
deleted file mode 100644
index 2e7fc6f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.d
+++ /dev/null
@@ -1,85 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_2.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2
-.super java/lang/Object
-
-.field private flg I
-.field public result Z
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const/4 v2, 0
- iput v2, v3, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2.flg I
-
- const/4 v2, 1
- iput-boolean v2, v3, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2.result Z
- return-void
-.end method
-
-.method public run(I)V
-.limit regs 10
-
- monitor-enter v8
-Label13:
- monitor-enter v8
-Label14:
-
- iput v9, v8, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2.flg I
-
-Label16:
- monitor-exit v8
-Label20:
-
- const-wide/16 v4, 500
-
-Label22:
- invoke-static {v4, v5}, java/lang/Thread/sleep(J)V
-Label23:
-
- iget v1, v8, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2.flg I
-
- if-eq v1, v9, Label35
-
- const/4 v5, 0
- iput-boolean v5, v8, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2.result Z
-
-Label35:
- monitor-exit v8
-Label37:
- return-void
-
-
-Label46:
- move-exception v4
-
- const/4 v6, 0
- iput-boolean v6, v8, dot.junit.opcodes.monitor_enter.d.T_monitor_enter_2.result Z
-
- monitor-exit v8
-Label53:
- throw v4
-
-.catch all from Label13 to Label14 using Label46
-.catch all from Label16 to Label20 using Label46
-.catch all from Label22 to Label23 using Label46
-.catch all from Label35 to Label37 using Label46
-.catch all from Label46 to Label53 using Label46
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.java
deleted file mode 100644
index d2f5add..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_enter.d;
-
-public class T_monitor_enter_2 {
-
- private int flg = 0;
- public boolean result = true;
-
- public void run(int v) throws InterruptedException {
- synchronized(this) {
- synchronized(this) {
- flg = v;
- }
- Thread.sleep(500);
- if(flg != v) {
- result = false;
- }
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d
deleted file mode 100644
index 7417a8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_3.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const/4 v5, 0
- monitor-enter v5
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.java
deleted file mode 100644
index ebb0f17..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_enter.d;
-
-public class T_monitor_enter_3 {
-
- public void run() {
- Object o = null;
- synchronized(o) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.d
deleted file mode 100644
index 5b3469d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_4.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- monitor-enter v6
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.java
deleted file mode 100644
index 83c41d4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_enter.d;
-
-public class T_monitor_enter_4 {
-
- public void run() {
- Object o = null;
- synchronized(o) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_5.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_5.d
deleted file mode 100644
index 7078aa0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_5.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v5, 12345
- monitor-enter v5
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_6.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_6.d
deleted file mode 100644
index 754a9e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_6.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v5, 1.23
- monitor-enter v5
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_7.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_7.d
deleted file mode 100644
index 8fb7791..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_7.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const-wide v4, 123456789321
- monitor-enter v4
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_8.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_8.d
deleted file mode 100644
index 3d45716..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_enter_8.java
-.class public dot.junit.opcodes.monitor_enter.d.T_monitor_enter_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const-wide v4, 1.79
- monitor-enter v4
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java
deleted file mode 100644
index d4f5842..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_exit;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.monitor_exit.d.T_monitor_exit_1;
-import dot.junit.opcodes.monitor_exit.d.T_monitor_exit_3;
-
-public class Test_monitor_exit extends DxTestCase {
-
- /**
- * @title thread is not monitor owner
- */
- public void testE1() throws InterruptedException {
- //@uses dot.junit.opcodes.monitor_exit.TestRunnable
- final T_monitor_exit_1 t = new T_monitor_exit_1();
- final Object o = new Object();
-
- Runnable r = new TestRunnable(t, o);
- synchronized (o) {
- Thread th = new Thread(r);
- th.start();
- th.join();
- }
- if (t.result == false) {
- fail("expected IllegalMonitorStateException");
- }
- }
-
-
- /**
- * @title expected NullPointerException
- */
- public void testE3() {
- T_monitor_exit_3 t = new T_monitor_exit_3();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title type of arguments - int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of arguments - float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of arguments - long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of arguments - double
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
-
-
-class TestRunnable implements Runnable {
- private T_monitor_exit_1 t;
- private Object o;
-
- public TestRunnable(T_monitor_exit_1 t, Object o) {
- this.t = t;
- this.o = o;
- }
-
- public void run() {
- try {
- t.run(o);
- } catch (IllegalMonitorStateException imse) {
- // expected
- t.result = true;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d
deleted file mode 100644
index bef8390..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_1.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_1
-.super java/lang/Object
-
-.field public result Z
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const/4 v2, 1
- iput-boolean v2, v3, dot.junit.opcodes.monitor_exit.d.T_monitor_exit_1.result Z
-
- return-void
-.end method
-
-.method public run(Ljava/lang/Object;)V
-.limit regs 5
-
- monitor-exit v3
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.java
deleted file mode 100644
index ff61a53..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_exit.d;
-
-public class T_monitor_exit_1 {
-
- public boolean result = false;
-
- public void run(Object o) {
- synchronized(o) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.d
deleted file mode 100644
index 9ef4034..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_3.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- monitor-enter v3
-
- const/4 v1, 0
-Label4:
- monitor-exit v1
-Label5:
- return-void
-Label6:
- move-exception v1
- monitor-exit v3
- throw v1
-.catch all from Label4 to Label5 using Label6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.java b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.java
deleted file mode 100644
index 162dd58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.monitor_exit.d;
-
-public class T_monitor_exit_3 {
-
- public void run() {
- synchronized(this) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_4.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_4.d
deleted file mode 100644
index 334f385..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_4.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- monitor-enter v3
- monitor-exit v4
-
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_5.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_5.d
deleted file mode 100644
index 9def3d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_5.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- monitor-enter v3
- const v3, 12345
- monitor-exit v3
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_6.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_6.d
deleted file mode 100644
index 9635212..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_6.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- monitor-enter v3
- const v3, 1.123
- monitor-exit v3
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_7.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_7.d
deleted file mode 100644
index c65ae56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_7.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- monitor-enter v3
- const-wide v0, 123456789321
- monitor-exit v0
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_8.d b/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_8.d
deleted file mode 100644
index 91be219..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitor_exit_8.java
-.class public dot.junit.opcodes.monitor_exit.d.T_monitor_exit_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- monitor-enter v3
- const-wide v0, 1.79
- monitor-exit v0
- return-void
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/Test_move.java b/tools/vm-tests/src/dot/junit/opcodes/move/Test_move.java
deleted file mode 100644
index d503890..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/Test_move.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move.d.T_move_1;
-
-public class Test_move extends DxTestCase {
- /**
- * @title test move functionality
- */
- public void testN1() {
- assertTrue(T_move_1.run());
- }
-
-
- /**
- * @constraint A23
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains wide
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_1.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_1.d
deleted file mode 100644
index 1d8e693..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_1.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_1.java
-.class public dot.junit.opcodes.move.d.T_move_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 16
- const v0, 1234
- const v15, 567989
-
- move v0, v15
-
- const v4, 567989
-
- if-ne v0, v4, Label0
- if-ne v15, v4, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_1.java b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_1.java
deleted file mode 100644
index 97f538f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move.d;
-
-public class T_move_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_2.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_2.d
deleted file mode 100644
index 4a5dfc7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_2.java
-.class public dot.junit.opcodes.move.d.T_move_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 9
-
- move v0, v9
-
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_3.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_3.d
deleted file mode 100644
index c9d094b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_3.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_3.java
-.class public dot.junit.opcodes.move.d.T_move_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 9
- const v0, 0
-
- move v15, v0
-
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_4.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_4.d
deleted file mode 100644
index 54adf05..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_4.java
-.class public dot.junit.opcodes.move.d.T_move_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 9
- move v1, v8
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_5.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_5.d
deleted file mode 100644
index 1ab33b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_5.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_5.java
-.class public dot.junit.opcodes.move.d.T_move_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 9
- const-wide v0, 124
-
- move v5, v0
-
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_6.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_6.d
deleted file mode 100644
index 91da915..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_6.java
-.class public dot.junit.opcodes.move.d.T_move_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 9
- const-wide v0, 124
-
- move v5, v1
-
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_7.d b/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_7.d
deleted file mode 100644
index fa615c1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move/d/T_move_7.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_7.java
-.class public dot.junit.opcodes.move.d.T_move_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 9
- const-wide v0, 124
- const v5, 0
-
- move v1, v5
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/Test_move_16.java b/tools/vm-tests/src/dot/junit/opcodes/move_16/Test_move_16.java
deleted file mode 100644
index f3e2ab0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/Test_move_16.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_16.d.T_move_16_1;
-import dot.junit.opcodes.move_16.d.T_move_16_2;
-
-public class Test_move_16 extends DxTestCase {
- /**
- * @title v4001 -> v4000
- */
- public void testN1() {
- assertTrue(T_move_16_1.run());
- }
-
- /**
- * @title v1 -> v4001
- */
- public void testN2() {
- assertTrue(T_move_16_2.run());
- }
-
- /**
- * @constraint A23
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains wide
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_1.d
deleted file mode 100644
index bb5335f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_1.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_1.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- const v0, 123
- const v1, 5678
-
- move/16 v4000, v0
- move/16 v4001, v1
-
- move/16 v4000, v4001
-
- const/4 v4, 5678
-
- move/16 v0, v4000
- move/16 v1, v4001
-
- if-ne v0, v4, Label0
- if-ne v1, v4, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_1.java
deleted file mode 100644
index 203468b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_16.d;
-
-public class T_move_16_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_2.d
deleted file mode 100644
index 52454ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_2.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_2.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- const v1, 5678
-
- move/16 v4001, v1
- move/16 v0, v4001
-
- const/4 v4, 5678
-
- if-ne v0, v4, Label0
- if-ne v1, v4, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_2.java b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_2.java
deleted file mode 100644
index 4729303..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_16.d;
-
-public class T_move_16_2 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_3.d
deleted file mode 100644
index 604cbf3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_3.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- move/16 v0, v5000
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_4.d
deleted file mode 100644
index 2c098a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_4.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const v0, 0
- move/16 v5000, v0
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_5.d
deleted file mode 100644
index ccacc33..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_5.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- move/16 v0, v4999
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_6.d
deleted file mode 100644
index eb4b9c8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_6.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const-wide v123, 123
- move/16 v255, v123
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_7.d
deleted file mode 100644
index a6aa1d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_7.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
-
- const-wide v123, 123
- move/16 v255, v124
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_8.d
deleted file mode 100644
index 8d98954..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_16/d/T_move_16_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_16_8.java
-.class public dot.junit.opcodes.move_16.d.T_move_16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 5000
-
- const-wide v123, 123
- const v0, 0
- move/16 v124, v0
- return-wide v123
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/Test_move_exception.java b/tools/vm-tests/src/dot/junit/opcodes/move_exception/Test_move_exception.java
deleted file mode 100644
index b4fd87c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/Test_move_exception.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_exception;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_exception.d.T_move_exception_1;
-import dot.junit.opcodes.move_exception.d.T_move_exception_2;
-
-public class Test_move_exception extends DxTestCase {
-
- /**
- * @title tests move-exception functionality
- */
- public void testN1() {
- T_move_exception_1 t = new T_move_exception_1();
- try {
- t.run();
- fail("ArithmeticException was not thrown");
- } catch (ArithmeticException ae) {
- //expected
- } catch (Exception ex) {
- fail("Exception " + ex + " was thrown instead off ArithmeticException");
- }
- }
-
- /**
- * @title tests move-exception functionality
- */
- public void testN2() {
- T_move_exception_2 t = new T_move_exception_2();
- assertTrue(t.run());
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_exception.d.T_move_exception_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B21
- * @title move-exception is not first instruction in an exception handler
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_exception.d.T_move_exception_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.d
deleted file mode 100644
index ed7aa2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_exception_1.java
-.class public dot.junit.opcodes.move_exception.d.T_move_exception_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
-Label1:
- const v1, 15
- const v2, 0
- div-int v0, v1, v2
-
-Label2:
- goto Label4
-
-Label3:
- move-exception v3
- throw v3
-
-Label4:
- return-void
-
-.catch all from Label1 to Label2 using Label3
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.java
deleted file mode 100644
index 9edf6ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_exception.d;
-
-public class T_move_exception_1 {
-
- public void run() {
- try{
- int a = 15/0;
- } catch(Exception ex) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_2.d
deleted file mode 100644
index 8713f3a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_2.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_exception_2.java
-.class public dot.junit.opcodes.move_exception.d.T_move_exception_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 6
-
-Label1:
- const v1, 1
- const v2, 0
- div-int v0, v1, v2
-
-Label2:
- goto Label4
-
-Label3:
- move-exception v3
- const v4, 1
- return v4
-
-Label4:
- const v4, 0
- return v4
-
-.catch java/lang/RuntimeException from Label1 to Label2 using Label3
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_2.java b/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_2.java
deleted file mode 100644
index ed66c22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_exception.d;
-
-public class T_move_exception_2 {
-
- public boolean run() {
- try {
- int a = 15/0;
- } catch (ArithmeticException ae) {
- return true;
- }
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_3.d
deleted file mode 100644
index 8141ddb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_3.d
+++ /dev/null
@@ -1,31 +0,0 @@
-.source T_move_exception_3.java
-.class public dot.junit.opcodes.move_exception.d.T_move_exception_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
-Label1:
- const v1, 1
- const v2, 0
- div-int v0, v1, v2
-
-Label2:
- goto Label4
-
-Label3:
- move-exception v6
-
-Label4:
- return-void
-
-.catch all from Label1 to Label2 using Label3
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_5.d
deleted file mode 100644
index fdad390..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_exception/d/T_move_exception_5.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_exception_5.java
-.class public dot.junit.opcodes.move_exception.d.T_move_exception_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
-Label1:
- const v1, 15
- const v2, 0
- div-int v0, v1, v2
-
-Label2:
- goto Label4
-
-Label3:
- nop
- move-exception v3
- throw v3
-
-Label4:
- return-void
-
-.catch all from Label1 to Label2 using Label3
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/Test_move_from16.java b/tools/vm-tests/src/dot/junit/opcodes/move_from16/Test_move_from16.java
deleted file mode 100644
index 725cbd8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/Test_move_from16.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_from16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_from16.d.T_move_from16_1;
-
-public class Test_move_from16 extends DxTestCase {
- /**
- * @title v4001 -> v255 -> v1
- */
- public void testN1() {
- assertTrue(T_move_from16_1.run());
- }
-
- /**
- * @constraint A23
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains wide
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_1.d
deleted file mode 100644
index e445cea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_1.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_1.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- const v10, 5678
-
- move/16 v4001, v10
-
- move/from16 v255, v4001
- move/from16 v1, v255
-
- const/4 v4, 5678
-
- if-ne v1, v4, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_1.java
deleted file mode 100644
index a32e85c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_from16.d;
-
-public class T_move_from16_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_3.d
deleted file mode 100644
index 88b3cae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_3.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- move/from16 v0, v5000
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_4.d
deleted file mode 100644
index e544a14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_4.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5
- const v1, 0
- move/from16 v5, v1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_5.d
deleted file mode 100644
index 400a01f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_5.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- move/from16 v0, v4999
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_6.d
deleted file mode 100644
index 662e314..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_6.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const-wide v4500, 123
- move/from16 v0, v4500
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_7.d
deleted file mode 100644
index 7d2f26c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_7.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
-
- const-wide v1234, 123
- move/from16 v255, v1235
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_8.d
deleted file mode 100644
index 5f8455a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_from16/d/T_move_from16_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_from16_8.java
-.class public dot.junit.opcodes.move_from16.d.T_move_from16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 5000
-
- const-wide v123, 123
- const v0, 0
- move/from16 v124, v0
- return-wide v123
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/Test_move_object.java b/tools/vm-tests/src/dot/junit/opcodes/move_object/Test_move_object.java
deleted file mode 100644
index d67be88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/Test_move_object.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_object.d.T_move_object_1;
-
-public class Test_move_object extends DxTestCase {
- /**
- * @title tests move-object functionality
- */
- public void testN1() {
- T_move_object_1 t = new T_move_object_1();
- assertEquals(t.run(), t);
- }
-
-
- /**
- * @constraint A23
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains integer
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains wide
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_1.d
deleted file mode 100644
index cc90a5f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_1.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 16
-
- move-object v0, v15
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_1.java
deleted file mode 100644
index c0b2483..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_object.d;
-
-public class T_move_object_1 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_2.d
deleted file mode 100644
index 4df3976..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_2.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-
-.method public run()V
-.limit regs 9
-
- move-object v15, v8
-
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_3.d
deleted file mode 100644
index 647a220..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_3.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 9
-
- move-object v1, v15
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_4.d
deleted file mode 100644
index f5538f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_4.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 9
- const v0, 1
- move-object v1, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_5.d
deleted file mode 100644
index d7951a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_5.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_5.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 9
- const-wide v0, 124
-
- move-object v5, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_6.d
deleted file mode 100644
index 7db5136..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_6.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 9
- const-wide v0, 124
-
- move-object v5, v1
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_7.d
deleted file mode 100644
index 0fe5509..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object/d/T_move_object_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_7.java
-.class public dot.junit.opcodes.move_object.d.T_move_object_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 9
- const-wide v0, 124
-
- move-object v1, v8
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java
deleted file mode 100644
index c3780cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_object_16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_object_16.d.T_move_object_16_1;
-
-public class Test_move_object_16 extends DxTestCase {
- /**
- * @title v4999 -> v4000 -> v1
- */
- public void testN1() {
- T_move_object_16_1 t = new T_move_object_16_1();
- assertEquals(t.run(), t);
- }
-
- /**
- * @constraint A23
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains integer
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains wide
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.d
deleted file mode 100644
index b60a448..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_1.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 5000
- move-object/16 v4000, v4999
- move-object/16 v1, v4000
-
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.java
deleted file mode 100644
index d0b85bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_object_16.d;
-
-public class T_move_object_16_1 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_3.d
deleted file mode 100644
index aad9893..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_3.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- move-object/16 v0, v5000
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_4.d
deleted file mode 100644
index 463646c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_4.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
- move-object/16 v6, v4
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_5.d
deleted file mode 100644
index 8cceaff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_5.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- const v0, 1234
- move-object/16 v2000, v0
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_6.d
deleted file mode 100644
index 6a5035d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_6.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- const-wide v123, 123
- move-object/16 v255, v123
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_7.d
deleted file mode 100644
index 0fce2b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_7.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
-
- const-wide v123, 123
- move-object/16 v255, v124
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_8.d
deleted file mode 100644
index 8f0d925..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_16_8.java
-.class public dot.junit.opcodes.move_object_16.d.T_move_object_16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 5000
-
- const-wide v123, 123
- move-object/16 v124, v4999
- return-wide v123
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java
deleted file mode 100644
index 2fe17d3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_object_from16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_object_from16.d.T_move_object_from16_1;
-
-
-public class Test_move_object_from16 extends DxTestCase {
- /**
- * @title v4999 -> v255 -> v1
- */
- public void testN1() {
- T_move_object_from16_1 t = new T_move_object_from16_1();
- assertEquals(t.run(), t);
- }
-
- /**
- * @constraint A23
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains integer
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains wide
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.d
deleted file mode 100644
index 434737e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_1.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 5000
- move-object/from16 v255, v4999
- move-object/from16 v1, v255
-
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.java
deleted file mode 100644
index 75f4bac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_object_from16.d;
-
-public class T_move_object_from16_1 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_3.d
deleted file mode 100644
index c2f4512..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_3.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- move/from16 v0, v5000
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_4.d
deleted file mode 100644
index 360ae14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_4.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- move-object/from16 v5, v4
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_5.d
deleted file mode 100644
index 94acfb9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_5.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- const v1, 1234
- move-object/from16 v0, v1
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_6.d
deleted file mode 100644
index d41f1f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_6.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const-wide v4500, 123
- move-object/from16 v0, v4500
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_7.d
deleted file mode 100644
index 09abc65..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_7.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
-
- const-wide v1234, 123
- move-object/from16 v255, v1235
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_8.d
deleted file mode 100644
index 93ff685..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_object_from16_8.java
-.class public dot.junit.opcodes.move_object_from16.d.T_move_object_from16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 5000
-
- const-wide v123, 123
- move-object/from16 v124, v4999
- return-wide v123
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/Test_move_result.java b/tools/vm-tests/src/dot/junit/opcodes/move_result/Test_move_result.java
deleted file mode 100644
index 9a0eaba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/Test_move_result.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_result.d.T_move_result_1;
-
-public class Test_move_result extends DxTestCase {
- /**
- * @title tests move-result functionality
- */
- public void testN1() {
- assertTrue(T_move_result_1.run());
- }
-
-
- /**
- * @constraint A23
- * @title number of registers - dest is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title wide
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B19
- * @title move-result instruction must be immediately preceded
- * (in the insns array) by an <invoke-kind> instruction
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B20
- * @title move-result instruction must be immediately preceded
- * (in actual control flow) by an <invoke-kind> instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_1.d
deleted file mode 100644
index 50c2eb2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_1.d
+++ /dev/null
@@ -1,55 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_1.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 16
-
- const v0, 0
-
- invoke-static {} dot/junit/opcodes/move_result/d/T_move_result_1/foo()I
-
- move-result v0
- const v1, 12345
-
- if-eq v0, v1 Label1
-
- const v0, 0
- return v0
-
-Label1:
- const v0, 1
- return v0
-
-.end method
-
-.method private static foo()I
-.limit regs 1
-
- const v0, 12345
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_1.java
deleted file mode 100644
index 0f97613..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result.d;
-
-public class T_move_result_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_2.d
deleted file mode 100644
index ad1b45c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_2.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_2.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- invoke-static {} dot/junit/opcodes/move_result/d/T_move_result_2/foo()I
- move-result v16
-
- return-void
-.end method
-
-.method private static foo()I
-.limit regs 1
-
- const v0, 12345
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_3.d
deleted file mode 100644
index 481f158..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_3.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_3.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result/d/T_move_result_3/foo()Ljava/lang/Object;
- move-result v0
-
- return-void
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_4.d
deleted file mode 100644
index 655aa7e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_4.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_4.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result/d/T_move_result_4/foo()J
- move-result v0
-
- return-void
-.end method
-
-.method private foo()J
-.limit regs 2
-
- const-wide v0, 1234
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_5.d
deleted file mode 100644
index 711b142..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_5.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_5.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 16
-
- const-wide v0, 123
-
- invoke-static {} dot/junit/opcodes/move_result/d/T_move_result_5/foo()I
- move-result v1
-
- return-wide v0
-.end method
-
-.method private static foo()I
-.limit regs 1
-
- const v0, 12345
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_6.d
deleted file mode 100644
index 9afeb48..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_6.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_6.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- invoke-static {} dot/junit/opcodes/move_result/d/T_move_result_6/foo()I
- nop
- move-result v1
-
- return-void
-.end method
-
-.method private static foo()I
-.limit regs 1
-
- const v0, 12345
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_7.d
deleted file mode 100644
index aaea908..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_7.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_7.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- goto Label1
- invoke-static {} dot/junit/opcodes/move_result/d/T_move_result_7/foo()I
-Label1:
- move-result v1
-
- return-void
-.end method
-
-.method private static foo()I
-.limit regs 1
-
- const v0, 12345
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_8.d
deleted file mode 100644
index da32cd0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result/d/T_move_result_8.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_8.java
-.class public dot.junit.opcodes.move_result.d.T_move_result_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- const v0, 0
-
- invoke-static {} dot/junit/opcodes/move_result/d/T_move_result_8/foo()I
-
- move-result v16
- return-void
-
-.end method
-
-.method private static foo()I
-.limit regs 1
-
- const v0, 12345
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java
deleted file mode 100644
index 9ee2ed1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_result_object.d.T_move_result_object_1;
-import dot.junit.opcodes.move_result_object.d.T_move_result_object_8;
-
-public class Test_move_result_object extends DxTestCase {
- /**
- * @title tests move-result-object functionality
- */
- public void testN1() {
- T_move_result_object_1 t = new T_move_result_object_1();
- assertTrue(t.run());
- }
-
- /**
- * @title filled-new-array result
- */
- public void testN2() {
- T_move_result_object_8 t = new T_move_result_object_8();
- int[] arr = t.run();
- if(arr.length != 2 || arr[0] != 1 || arr[1] != 2)
- fail("wrong array size or content");
- }
-
- /**
- * @constraint A23
- * @title number of registers - dest is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title integer
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title wide
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B19
- * @title move-result-object instruction must be immediately preceded
- * (in the insns array) by an <invoke-kind> instruction
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B20
- * @title move-result-object instruction must be immediately preceded
- * (in actual control flow) by an <invoke-kind> instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.d
deleted file mode 100644
index 433b86f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_1.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 16
-
- const v0, 0
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_1/foo()Ljava/lang/Object;
-
- move-result-object v0
-
- if-eq v0, v15, Label1
-
- const v0, 0
- return v0
-
-Label1:
- const v0, 1
- return v0
-
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.java
deleted file mode 100644
index 76cdb0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result_object.d;
-
-public class T_move_result_object_1 {
-
- public boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_2.d
deleted file mode 100644
index 22c1b0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_2.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_object_2.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_2/foo()Ljava/lang/Object;
- move-result-object v16
-
- return-void
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_3.d
deleted file mode 100644
index a788844..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_3.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_object_3.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_3/foo()I
- move-result-object v0
-
- return-void
-.end method
-
-.method private foo()I
-.limit regs 1
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_4.d
deleted file mode 100644
index b3229b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_4.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_object_4.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_4/foo()J
- move-result-object v0
-
- return-void
-.end method
-
-.method private foo()J
-.limit regs 2
-
- const-wide v0, 1234
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_5.d
deleted file mode 100644
index 6216f18..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_5.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_object_5.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 16
-
- const-wide v0, 123
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_5/foo()Ljava/lang/Object;
- move-result-object v1
-
- return-wide v0
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_6.d
deleted file mode 100644
index 8de3274..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_6.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_object_6.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_6/foo()Ljava/lang/Object;
- nop
- move-result-object v1
-
- return-void
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_7.d
deleted file mode 100644
index 088b386..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_7.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_object_7.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- goto Label1
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_7/foo()Ljava/lang/Object;
-Label1:
- move-result-object v1
-
- return-void
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.d
deleted file mode 100644
index 0cbb044..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_8.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[I
-.limit regs 16
- const v1, 1
- const v2, 2
- filled-new-array {v1, v2}, [I
- move-result-object v5
-
- return-object v5
-
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.java
deleted file mode 100644
index 3eb0ea1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result_object.d;
-
-public class T_move_result_object_8 {
-
- public int[] run() {
- int arr[] = new int[2];
- arr[0] = 1;
- arr[1] = 2;
- return arr;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_9.d
deleted file mode 100644
index 92600b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_9.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_9.java
-.class public dot.junit.opcodes.move_result_object.d.T_move_result_object_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_object/d/T_move_result_object_9/foo()Ljava/lang/Object;
-
- move-result-object v16
- return-void
-
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java
deleted file mode 100644
index 6c849dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_result_wide.d.T_move_result_wide_1;
-
-public class Test_move_result_wide extends DxTestCase {
- /**
- * @title tests move-result-wide functionality
- */
- public void testN1() {
- assertTrue(T_move_result_wide_1.run());
- }
-
-
- /**
- * @constraint A23
- * @title number of registers - dest is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title 32-bit value
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B19
- * @title move-result-wide instruction must be immediately preceded
- * (in the insns array) by an <invoke-kind> instruction
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B20
- * @title move-result-wide instruction must be immediately preceded
- * (in actual control flow) by an <invoke-kind> instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.d
deleted file mode 100644
index e0d80c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.d
+++ /dev/null
@@ -1,56 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_1.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 16
-
- const v0, 0
-
- invoke-static {} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1/foo()J
-
- move-result-wide v0
- const-wide v2, 12345
-
- cmp-long v5, v0, v2
- if-eqz v5, Label1
-
- const v0, 0
- return v0
-
-Label1:
- const v0, 1
- return v0
-
-.end method
-
-.method private static foo()J
-.limit regs 2
-
- const-wide v0, 12345
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.java
deleted file mode 100644
index 4c7ef16..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_result_wide.d;
-
-public class T_move_result_wide_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2.d
deleted file mode 100644
index 35eb63c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_2.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- invoke-static {} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2/foo()J
- move-result-wide v16
-
- return-void
-.end method
-
-.method private static foo()J
-.limit regs 2
-
- const-wide v0, 12345
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3.d
deleted file mode 100644
index 5f53fa3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_3.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3/foo()Ljava/lang/Object;
- move-result-wide v0
-
- return-void
-.end method
-
-.method private foo()Ljava/lang/Object;
-.limit regs 1
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4.d
deleted file mode 100644
index 3c10cab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_4.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 16
-
- invoke-direct {v15} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4/foo()I
- move-result-wide v0
-
- return-void
-.end method
-
-.method private foo()I
-.limit regs 2
-
- const v0, 1234
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5.d
deleted file mode 100644
index 9126ee2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_5.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 16
-
- const-wide v0, 123
-
- invoke-static {} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5/foo()J
- move-result-wide v1
-
- return-wide v0
-.end method
-
-.method private static foo()J
-.limit regs 2
-
- const-wide v0, 12345
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6.d
deleted file mode 100644
index a499958..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_6.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- invoke-static {} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6/foo()J
- nop
- move-result-wide v1
-
- return-void
-.end method
-
-.method private static foo()J
-.limit regs 2
-
- const-wide v0, 12345
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7.d
deleted file mode 100644
index f6d47eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_7.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- goto Label1
- invoke-static {} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7/foo()J
-Label1:
- move-result-wide v1
-
- return-void
-.end method
-
-.method private static foo()J
-.limit regs 2
-
- const-wide v0, 12345
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8.d
deleted file mode 100644
index f385a2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_result_wide_8.java
-.class public dot.junit.opcodes.move_result_wide.d.T_move_result_wide_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 16
-
- const v0, 0
-
- invoke-static {} dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8/foo()J
-
- move-result-wide v16
- return-void
-
-.end method
-
-.method private static foo()J
-.limit regs 2
-
- const-wide v0, 12345
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/Test_move_wide.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide/Test_move_wide.java
deleted file mode 100644
index 4ab7421..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/Test_move_wide.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_wide.d.T_move_wide_1;
-import dot.junit.opcodes.move_wide.d.T_move_wide_6;
-
-public class Test_move_wide extends DxTestCase {
- /**
- * @title tests move-wide functionality
- */
- public void testN1() {
- assertTrue(T_move_wide_1.run());
- }
-
-
- /**
- * @title v0 -> v1
- */
- public void testN2() {
- assertEquals(T_move_wide_6.run(), 0);
- }
-
- /**
- * @constraint A24
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains 32-bit value
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.d
deleted file mode 100644
index b0597f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.d
+++ /dev/null
@@ -1,49 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_1.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 16
- const-wide v0, 1234
- const-wide v14, 567989
-
- move-wide v0, v14
-
- const-wide v4, 567989
-
- cmp-long v10, v0, v4
- if-nez v10, Label0
- cmp-long v10, v14, v4
- if-nez v10, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.java
deleted file mode 100644
index 8ddde82..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide.d;
-
-public class T_move_wide_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_2.d
deleted file mode 100644
index 22e992b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_2.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 9
-
- move-wide v0, v9
-
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_3.d
deleted file mode 100644
index b8e3db0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_3.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 9
- const-wide v0, 0
-
- move v9, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_4.d
deleted file mode 100644
index 3eb95df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_4.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 9
- move-wide v1, v8
-
- const v1, 0
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_5.d
deleted file mode 100644
index 92e67dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_5.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_5.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 9
- const v0, 124
-
- move-wide v5, v0
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_6.d
deleted file mode 100644
index 4fecf88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_6.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_6.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()I
-.limit regs 9
- const-wide v0, 1233746384323
-
- move-wide v1, v0
-
- const-wide v4, 1233746384323
- cmp-long v8, v1, v4
-
- return v8
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_6.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_6.java
deleted file mode 100644
index bd5de04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide.d;
-
-public class T_move_wide_6 {
-
- public static int run() {
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_7.d
deleted file mode 100644
index 9324fef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide/d/T_move_wide_7.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_7.java
-.class public dot.junit.opcodes.move_wide.d.T_move_wide_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 9
- const-wide v0, 124
- const-wide v5, 0
-
- move-wide v1, v5
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java
deleted file mode 100644
index a2b776d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_wide_16.d.T_move_wide_16_1;
-import dot.junit.opcodes.move_wide_16.d.T_move_wide_16_9;
-
-public class Test_move_wide_16 extends DxTestCase {
- /**
- * @title v4001 -> v4000
- */
- public void testN1() {
- assertTrue(T_move_wide_16_1.run());
- }
-
- /**
- * @title v1 -> v4001
- */
- public void testN2() {
- assertTrue(T_move_wide_16_1.run());
- }
-
- /**
- * @title v1 -> v2
- */
- public void testN3() {
- assertEquals(T_move_wide_16_9.run(), 0);
- }
-
- /**
- * @constraint A24
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains 32-bit value
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.d
deleted file mode 100644
index 282edb4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.d
+++ /dev/null
@@ -1,55 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_1.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- const-wide v0, 123
- const-wide v2, 5678
-
- move-wide/16 v4000, v0
- move-wide/16 v4002, v2
-
- move-wide/16 v4000, v4002
-
- const-wide v4, 5678
-
- move-wide/16 v0, v4000
- move-wide/16 v2, v4002
-
- cmp-long v10, v0, v4
- if-nez v10, Label0
- cmp-long v10, v2, v4
- if-nez v10, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.java
deleted file mode 100644
index 66b4da1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_16.d;
-
-public class T_move_wide_16_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.d
deleted file mode 100644
index 57c7c93..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.d
+++ /dev/null
@@ -1,49 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_2.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- const-wide/16 v2, 5678
-
- move-wide/16 v4001, v2
- move-wide/16 v0, v4001
-
- const-wide v4, 5678
-
- cmp-long v10, v2, v4
- if-nez v10, Label0
- cmp-long v10, v0, v4
- if-nez v10, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.java
deleted file mode 100644
index e5f4966..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_16.d;
-
-public class T_move_wide_16_2 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_3.d
deleted file mode 100644
index e1e0ac7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_3.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- move-wide/16 v0, v5000
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_4.d
deleted file mode 100644
index 3f12810..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_4.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const-wide v0, 0
- move-wide/16 v5000, v0
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_5.d
deleted file mode 100644
index 7e61df4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_5.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- move-wide/16 v0, v4999
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_6.d
deleted file mode 100644
index 2cea620..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_6.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const v123, 123
- move-wide/16 v255, v123
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_7.d
deleted file mode 100644
index 7826131..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_7.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
-
- const-wide v123, 123
- move-wide/16 v255, v124
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_8.d
deleted file mode 100644
index c5e006d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_8.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 5000
-
- const-wide v123, 123
- const-wide v0, 0
- move-wide/16 v124, v0
- return-wide v123
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_9.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_9.d
deleted file mode 100644
index aa8cdce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_9.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_16_9.java
-.class public dot.junit.opcodes.move_wide_16.d.T_move_wide_16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()I
-.limit regs 5000
- const-wide v1, 1233746384323
- move-wide/16 v2, v1
-
- const-wide v10, 1233746384323
- cmp-long v4, v2, v10
-
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_9.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_9.java
deleted file mode 100644
index f66146b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_16.d;
-
-public class T_move_wide_16_9 {
-
- public static int run() {
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java
deleted file mode 100644
index 2434e92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_from16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_1;
-import dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_2;
-
-public class Test_move_wide_from16 extends DxTestCase {
- /**
- * @title v4001 -> v255 -> v1
- */
- public void testN1() {
- assertTrue(T_move_wide_from16_1.run());
- }
-
- /**
- * @title v100 -> 101
- */
- public void testN2() {
- assertEquals(T_move_wide_from16_2.run(), 0);
- }
-
- /**
- * @constraint A24
- * @title number of registers - src is not valid
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers - dst is not valid
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register contains 32-bit value
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title src register is a part of reg pair
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B18
- * @title When writing to a register that is one half of a
- * register pair, but not touching the other half, the old register pair gets broken
- * up, and the other register involved in it becomes undefined.
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_1.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_1.d
deleted file mode 100644
index 21aaca8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_1.d
+++ /dev/null
@@ -1,49 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_1.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- const-wide v10, 5678233453
-
- move-wide/16 v4001, v10
-
- move-wide/from16 v255, v4001
- move-wide/from16 v1, v255
-
- const-wide v4, 5678233453
-
- cmp-long v0, v1, v4
- if-nez v0, Label0
-
- const v1, 1
- return v1
-
-Label0:
- const v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_1.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_1.java
deleted file mode 100644
index 8dfcd57..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_from16.d;
-
-public class T_move_wide_from16_1 {
-
- public static boolean run() {
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_2.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_2.d
deleted file mode 100644
index d2e6700..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_2.d
+++ /dev/null
@@ -1,39 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_2.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()I
-.limit regs 5000
- const-wide v100, 5678233453
- move-wide/from16 v101, v100
-
- const-wide v4, 5678233453
-
- cmp-long v0, v101, v4
-
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_2.java b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_2.java
deleted file mode 100644
index b320731..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.move_wide_from16.d;
-
-public class T_move_wide_from16_2 {
-
- public static int run() {
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3.d
deleted file mode 100644
index 8f95101..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_3.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5000
- move-wide/from16 v0, v5000
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4.d
deleted file mode 100644
index e5f282a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_4.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()Z
-.limit regs 5
- const v1, 0
- move-wide/from16 v5, v1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5.d
deleted file mode 100644
index 21ec075..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_5.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5000
- move-wide/from16 v0, v4999
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_6.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_6.d
deleted file mode 100644
index 784e31a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_6.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
- const v4500, 123
- move-wide/from16 v0, v4500
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_7.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_7.d
deleted file mode 100644
index 1790fe5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_7.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()V
-.limit regs 5000
-
- const-wide v1234, 123
- move-wide/from16 v255, v1235
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8.d b/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8.d
deleted file mode 100644
index 80d80e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_move_wide_from16_8.java
-.class public dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()J
-.limit regs 5000
-
- const-wide v123, 123
- const-wide v0, 0
- move-wide/from16 v124, v0
- return-wide v123
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/Test_mul_double.java b/tools/vm-tests/src/dot/junit/opcodes/mul_double/Test_mul_double.java
deleted file mode 100644
index 9a63412..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/Test_mul_double.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_double.d.T_mul_double_1;
-import dot.junit.opcodes.mul_double.d.T_mul_double_4;
-
-public class Test_mul_double extends DxTestCase {
- /**
- * @title Arguments = 2.7d, 3.14d
- */
-
- public void testN1() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(8.478000000000002d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Arguments = 0, -3.14d
- */
- public void testN2() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(-0d, t.run(0, -3.14d));
- }
-
- /**
- * @title Arguments = -2.7d, -3.14d
- */
- public void testN3() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(8.478000000000002d, t.run(-3.14d, -2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this multiplication of long and long makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_mul_double_4 t = new T_mul_double_4();
- try {
- t.run(500000l, 2.7d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, 0
- */
- public void testB2() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY, 0));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB3() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = +0, -0d
- */
- public void testB5() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(-0d, t.run(+0d, -0d));
- }
-
- /**
- * @title Arguments = -0d, -0d
- */
- public void testB6() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(+0d, t.run(-0d, -0d));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.MAX_VALUE
- */
- public void testB7() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.MAX_VALUE,
- Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.MIN_VALUE, -1.4E-45f
- */
- public void testB8() {
- T_mul_double_1 t = new T_mul_double_1();
- assertEquals(-0d, t.run(Double.MIN_VALUE, -1.4E-45f));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.d
deleted file mode 100644
index 8f7a9a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_1.java
-.class public dot.junit.opcodes.mul_double.d.T_mul_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- mul-double v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.java
deleted file mode 100644
index a70f250..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_double.d;
-
-public class T_mul_double_1 {
-
- public double run(double a, double b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_2.d
deleted file mode 100644
index 99dd815..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_2.java
-.class public dot.junit.opcodes.mul_double.d.T_mul_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- mul-double v0, v10, v14
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_3.d
deleted file mode 100644
index 54a26c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_3.java
-.class public dot.junit.opcodes.mul_double.d.T_mul_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)D
-.limit regs 14
-
- mul-double v0, v11, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.d
deleted file mode 100644
index 54df7a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_4.java
-.class public dot.junit.opcodes.mul_double.d.T_mul_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)D
-.limit regs 14
-
- mul-double v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.java b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.java
deleted file mode 100644
index a707538..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_double.d;
-
-public class T_mul_double_4 {
-
- public double run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_5.d
deleted file mode 100644
index d3d6ec3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double/d/T_mul_double_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_5.java
-.class public dot.junit.opcodes.mul_double.d.T_mul_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- mul-double v0, v9, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java
deleted file mode 100644
index 2637e18..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_double_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_1;
-import dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_4;
-
-public class Test_mul_double_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 2.7d, 3.14d
- */
-
- public void testN1() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(8.478000000000002d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Arguments = 0, -3.14d
- */
- public void testN2() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(-0d, t.run(0, -3.14d));
- }
-
- /**
- * @title Arguments = -2.7d, -3.14d
- */
- public void testN3() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(8.478000000000002d, t.run(-3.14d, -2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this multiplication of long and long makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_mul_double_2addr_4 t = new T_mul_double_2addr_4();
- try {
- t.run(500000l, 2.7d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, 0
- */
- public void testB2() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY, 0));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB3() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = +0, -0d
- */
- public void testB5() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(-0d, t.run(+0d, -0d));
- }
-
- /**
- * @title Arguments = -0d, -0d
- */
- public void testB6() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(+0d, t.run(-0d, -0d));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.MAX_VALUE
- */
- public void testB7() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.MAX_VALUE,
- Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.MIN_VALUE, -1.4E-45f
- */
- public void testB8() {
- T_mul_double_2addr_1 t = new T_mul_double_2addr_1();
- assertEquals(-0d, t.run(Double.MIN_VALUE, -1.4E-45f));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.d
deleted file mode 100644
index 373a854..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_2addr_1.java
-.class public dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- mul-double/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.java
deleted file mode 100644
index f5bdb4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_double_2addr.d;
-
-public class T_mul_double_2addr_1 {
-
- public double run(double a, double b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2.d
deleted file mode 100644
index 05485d8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_2addr_2.java
-.class public dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- mul-double/2addr v10, v14
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3.d
deleted file mode 100644
index d981779..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_2addr_3.java
-.class public dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)D
-.limit regs 14
-
- mul-double/2addr v11, v12
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.d
deleted file mode 100644
index 1654300..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_2addr_4.java
-.class public dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)D
-.limit regs 14
-
- mul-double/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.java b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.java
deleted file mode 100644
index 8a17e15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_double_2addr.d;
-
-public class T_mul_double_2addr_4 {
-
- public double run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5.d
deleted file mode 100644
index ef36f48..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_double_2addr_5.java
-.class public dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- mul-double/2addr v9, v12
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/Test_mul_float.java b/tools/vm-tests/src/dot/junit/opcodes/mul_float/Test_mul_float.java
deleted file mode 100644
index 6359122..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/Test_mul_float.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_float.d.T_mul_float_1;
-import dot.junit.opcodes.mul_float.d.T_mul_float_6;
-
-public class Test_mul_float extends DxTestCase {
-
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(8.478001f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Arguments = 0, -3.14f
- */
- public void testN2() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(-0f, t.run(0, -3.14f));
- }
-
- /**
- * @title Arguments = -2.7f, -3.14f
- */
- public void testN3() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(8.478001f, t.run(-3.14f, -2.7f));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_mul_float_6 t = new T_mul_float_6();
- try {
- t.run(3.12f, 13);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, 0
- */
- public void testB2() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY, 0));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB3() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = +0, -0f
- */
- public void testB5() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(-0f, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = -0f, -0f
- */
- public void testB6() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(+0f, t.run(-0f, -0f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.MAX_VALUE
- */
- public void testB7() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
- Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE, -1.4E-45f
- */
- public void testB8() {
- T_mul_float_1 t = new T_mul_float_1();
- assertEquals(-0f, t.run(Float.MIN_VALUE, -1.4E-45f));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.d
deleted file mode 100644
index 8be7048..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_1.java
-.class public dot.junit.opcodes.mul_float.d.T_mul_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- mul-float v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.java
deleted file mode 100644
index 4010691..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_float.d;
-
-public class T_mul_float_1 {
-
- public float run(float a, float b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_2.d
deleted file mode 100644
index 2647599..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_2.java
-.class public dot.junit.opcodes.mul_float.d.T_mul_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- mul-float v0, v6, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_3.d
deleted file mode 100644
index 13a31f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_3.java
-.class public dot.junit.opcodes.mul_float.d.T_mul_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)F
-.limit regs 8
-
- mul-float v0, v5, v6
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_4.d
deleted file mode 100644
index a92ef8f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_4.java
-.class public dot.junit.opcodes.mul_float.d.T_mul_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JF)F
-.limit regs 8
-
- mul-float v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_5.d
deleted file mode 100644
index 9f99d59..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_mul_float_5.java
-.class public dot.junit.opcodes.mul_float.d.T_mul_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- mul-float v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.d
deleted file mode 100644
index 7b3b61a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_mul_float_6.java
-.class public dot.junit.opcodes.mul_float.d.T_mul_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)F
-.limit regs 8
-
- mul-float v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.java b/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.java
deleted file mode 100644
index abccc0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_float.d;
-
-public class T_mul_float_6 {
-
- public float run(float a, int b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java
deleted file mode 100644
index 0686a9b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_float_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_1;
-import dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_6;
-
-public class Test_mul_float_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(8.478001f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Arguments = 0, -3.14f
- */
- public void testN2() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(-0f, t.run(0, -3.14f));
- }
-
- /**
- * @title Arguments = -2.7f, -3.14f
- */
- public void testN3() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(8.478001f, t.run(-3.14f, -2.7f));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_mul_float_2addr_6 t = new T_mul_float_2addr_6();
- try {
- t.run(3.12f, 13);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, 0
- */
- public void testB2() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY, 0));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB3() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = +0, -0f
- */
- public void testB5() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(-0f, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = -0f, -0f
- */
- public void testB6() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(+0f, t.run(-0f, -0f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.MAX_VALUE
- */
- public void testB7() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
- Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE, -1.4E-45f
- */
- public void testB8() {
- T_mul_float_2addr_1 t = new T_mul_float_2addr_1();
- assertEquals(-0f, t.run(Float.MIN_VALUE, -1.4E-45f));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.d
deleted file mode 100644
index 05faaba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_mul_float_2addr_1.java
-.class public dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- mul-float/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.java
deleted file mode 100644
index 1f6b647..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_float_2addr.d;
-
-public class T_mul_float_2addr_1 {
-
- public float run(float a, float b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2.d
deleted file mode 100644
index 11fef7b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_2addr_2.java
-.class public dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- mul-float/2addr v6, v8
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3.d
deleted file mode 100644
index 9d83fef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_2addr_3.java
-.class public dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)F
-.limit regs 8
-
- mul-float/2addr v5, v6
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4.d
deleted file mode 100644
index eebb510..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_float_2addr_4.java
-.class public dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JF)F
-.limit regs 8
-
- mul-float/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5.d
deleted file mode 100644
index 03a888b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_mul_float_2addr_5.java
-.class public dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- mul-float/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.d
deleted file mode 100644
index 67cccbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_mul_float_2addr_6.java
-.class public dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)F
-.limit regs 8
-
- mul-float/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.java
deleted file mode 100644
index f580894..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_float_2addr.d;
-
-public class T_mul_float_2addr_6 {
-
- public float run(float a, int b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/Test_mul_int.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int/Test_mul_int.java
deleted file mode 100644
index f9252c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/Test_mul_int.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_int.d.T_mul_int_1;
-import dot.junit.opcodes.mul_int.d.T_mul_int_6;
-
-public class Test_mul_int extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(32, t.run(8, 4));
- }
-
- /**
- * @title Arguments = -2, 255
- */
- public void testN2() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(-510, t.run(-2, 255));
- }
-
- /**
- * @title Arguments = 0x7ffffffe, 2
- */
- public void testN3() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(-4, t.run(0x7ffffffe, 2));
- }
-
- /**
- * @title Arguments = 4, 0x80000001
- */
- public void testN4() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(4, t.run(4, 0x80000001));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_mul_int_6 t = new T_mul_int_6();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Integer.MAX_VALUE
- */
- public void testB1() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(0, t.run(0, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB2() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB3() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB4() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE,
- Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_mul_int_1 t = new T_mul_int_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.d
deleted file mode 100644
index 3b4a63f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_1.java
-.class public dot.junit.opcodes.mul_int.d.T_mul_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 9
-
- mul-int v0, v7, v8
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.java
deleted file mode 100644
index 4ac3bea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int.d;
-
-public class T_mul_int_1 {
-
- public int run(int a, int b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_2.d
deleted file mode 100644
index ed71fa1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2.java
-.class public dot.junit.opcodes.mul_int.d.T_mul_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- mul-int v0, v7, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_3.d
deleted file mode 100644
index 059f7b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_3.java
-.class public dot.junit.opcodes.mul_int.d.T_mul_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 9
-
- mul-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_4.d
deleted file mode 100644
index 67c0e37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_4.java
-.class public dot.junit.opcodes.mul_int.d.T_mul_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 9
-
- mul-int v0, v6, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_5.d
deleted file mode 100644
index 04be572..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_5.java
-.class public dot.junit.opcodes.mul_int.d.T_mul_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 9
-
- mul-int v0, v6, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.d
deleted file mode 100644
index e181e71..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_6.java
-.class public dot.junit.opcodes.mul_int.d.T_mul_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 9
-
- mul-int v0, v7, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.java
deleted file mode 100644
index a4e6a07..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int.d;
-
-public class T_mul_int_6 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java
deleted file mode 100644
index 010896c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_1;
-import dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_6;
-
-public class Test_mul_int_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(32, t.run(8, 4));
- }
-
- /**
- * @title Arguments = -2, 255
- */
- public void testN2() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(-510, t.run(-2, 255));
- }
-
- /**
- * @title Arguments = 0x7ffffffe, 2
- */
- public void testN3() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(-4, t.run(0x7ffffffe, 2));
- }
-
- /**
- * @title Arguments = 4, 0x80000001
- */
- public void testN4() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(4, t.run(4, 0x80000001));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_mul_int_2addr_6 t = new T_mul_int_2addr_6();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Integer.MAX_VALUE
- */
- public void testB1() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(0, t.run(0, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB2() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB3() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB4() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE,
- Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_mul_int_2addr_1 t = new T_mul_int_2addr_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.d
deleted file mode 100644
index 86a6c9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2addr_1.java
-.class public dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- mul-int/2addr v6, v7
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.java
deleted file mode 100644
index b4878b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_2addr.d;
-
-public class T_mul_int_2addr_1 {
-
- public int run(int a, int b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2.d
deleted file mode 100644
index 744c214..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2addr_2.java
-.class public dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- mul-int/2addr v7, v8
- return v7
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3.d
deleted file mode 100644
index 8c14a36..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2addr_3.java
-.class public dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- mul-int/2addr v5, v6
- return v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4.d
deleted file mode 100644
index 64e0ba1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2addr_4.java
-.class public dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- mul-int/2addr v5, v7
- return v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5.d
deleted file mode 100644
index 9a22395..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2addr_5.java
-.class public dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- mul-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.d
deleted file mode 100644
index c8bbcd2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_2addr_6.java
-.class public dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 8
-
- mul-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.java
deleted file mode 100644
index 71f6655..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_2addr.d;
-
-public class T_mul_int_2addr_6 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java
deleted file mode 100644
index d77dd0a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_1;
-import dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_2;
-import dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_3;
-import dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_4;
-import dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_5;
-import dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_6;
-
-public class Test_mul_int_lit16 extends DxTestCase {
-
- /**
- * @title Arguments = 205, 130
- */
- public void testN1() {
- T_mul_int_lit16_1 t = new T_mul_int_lit16_1();
- assertEquals(26650, t.run(205));
- }
-
- /**
- * @title Arguments = -180, 130
- */
- public void testN2() {
- T_mul_int_lit16_1 t = new T_mul_int_lit16_1();
- assertEquals(-23400, t.run(-180));
- }
-
- /**
- * @title Arguments = 0xfa, 130
- */
- public void testN3() {
- T_mul_int_lit16_1 t = new T_mul_int_lit16_1();
- assertEquals(0x7ef4, t.run(0xfa));
- }
-
- /**
- * @title Arguments = -101, -321
- */
- public void testN4() {
- T_mul_int_lit16_2 t = new T_mul_int_lit16_2();
- assertEquals(32421, t.run(-101));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_mul_int_lit16_3 t = new T_mul_int_lit16_3();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB1() {
- T_mul_int_lit16_4 t = new T_mul_int_lit16_4();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Arguments = 0, Short.MAX_VALUE
- */
- public void testB2() {
- T_mul_int_lit16_4 t = new T_mul_int_lit16_4();
- assertEquals(0, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Short.MAX_VALUE
- */
- public void testB3() {
- T_mul_int_lit16_5 t = new T_mul_int_lit16_5();
- assertEquals(Short.MAX_VALUE, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Short.MIN_VALUE
- */
- public void testB4() {
- T_mul_int_lit16_5 t = new T_mul_int_lit16_5();
- assertEquals(Short.MIN_VALUE, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 32767, Short.MIN_VALUE
- */
- public void testB5() {
- T_mul_int_lit16_6 t = new T_mul_int_lit16_6();
- assertEquals(-1073709056, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int * double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long * int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference * int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.d
deleted file mode 100644
index d7dd6f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_1.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v8, 130
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.java
deleted file mode 100644
index e4b1503..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_1 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.d
deleted file mode 100644
index 91c550c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_10.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v7, 4321
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.java
deleted file mode 100644
index 54d82de..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_10 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.d
deleted file mode 100644
index 200afbe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_2.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v8, -321
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.java
deleted file mode 100644
index 33fab36..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_2 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.d
deleted file mode 100644
index aed3dd4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_3.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 9
-
- mul-int/lit16 v0, v8, 130
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.java
deleted file mode 100644
index 959ac8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_3 {
-
- public int run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.d
deleted file mode 100644
index 532ce52..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_4.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v8, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.java
deleted file mode 100644
index e4abf30..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_4 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.d
deleted file mode 100644
index 0d4d3ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_5.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v8, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.java
deleted file mode 100644
index 4ca4f63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_5 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.d
deleted file mode 100644
index a719ab3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_6.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v8, 32767
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.java
deleted file mode 100644
index d926570..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_6 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.d
deleted file mode 100644
index 511de2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_7.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit16 v0, v9, 3276
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.java
deleted file mode 100644
index a891dd9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_7 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.d
deleted file mode 100644
index 288f649..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_8.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 9
-
- mul-int/lit16 v0, v7, 4321
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.java
deleted file mode 100644
index d639850..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_8 {
-
- public int run(double a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.d
deleted file mode 100644
index e8d0737..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit16_9.java
-.class public dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 9
-
- mul-int/lit16 v0, v7, 4321
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.java
deleted file mode 100644
index b7f8085..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit16.d;
-
-public class T_mul_int_lit16_9 {
-
- public int run(long a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java
deleted file mode 100644
index e2dae07..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_1;
-import dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_2;
-import dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_3;
-import dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_4;
-import dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_5;
-import dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_6;
-
-public class Test_mul_int_lit8 extends DxTestCase {
-
- /**
- * @title Arguments = 10, 55
- */
- public void testN1() {
- T_mul_int_lit8_1 t = new T_mul_int_lit8_1();
- assertEquals(550, t.run(55));
- }
-
- /**
- * @title Arguments = 10, -25
- */
- public void testN2() {
- T_mul_int_lit8_1 t = new T_mul_int_lit8_1();
- assertEquals(-250, t.run(-25));
- }
-
- /**
- * @title Arguments = -15, -23
- */
- public void testN3() {
- T_mul_int_lit8_2 t = new T_mul_int_lit8_2();
- assertEquals(345, t.run(-23));
- }
-
- /**
- * @title Arguments = 0x7ffffffe, 10
- */
- public void testN4() {
- T_mul_int_lit8_1 t = new T_mul_int_lit8_1();
- assertEquals(-20, t.run(0x7ffffffe));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_mul_int_lit8_3 t = new T_mul_int_lit8_3();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB1() {
- T_mul_int_lit8_4 t = new T_mul_int_lit8_4();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Arguments = 0, Byte.MAX_VALUE
- */
- public void testB2() {
- T_mul_int_lit8_4 t = new T_mul_int_lit8_4();
- assertEquals(0, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Byte.MAX_VALUE
- */
- public void testB3() {
- T_mul_int_lit8_5 t = new T_mul_int_lit8_5();
- assertEquals(Byte.MAX_VALUE, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Short.MIN_VALUE
- */
- public void testB4() {
- T_mul_int_lit8_5 t = new T_mul_int_lit8_5();
- assertEquals(Short.MIN_VALUE, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 127, Short.MIN_VALUE
- */
- public void testB5() {
- T_mul_int_lit8_6 t = new T_mul_int_lit8_6();
- assertEquals(-4161536, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int * double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long * int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference * int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.d
deleted file mode 100644
index 8aebfd4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_1.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v8, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.java
deleted file mode 100644
index dd87288..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_1 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.d
deleted file mode 100644
index 716726e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_10.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v7, 111
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.java
deleted file mode 100644
index a50d3d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_10 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.d
deleted file mode 100644
index c4d9174..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_2.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v8, -15
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.java
deleted file mode 100644
index 97e30cb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_2 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.d
deleted file mode 100644
index fc70d45..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_3.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 9
-
- mul-int/lit8 v0, v8, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.java
deleted file mode 100644
index dc7352a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_3 {
-
- public int run(float a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.d
deleted file mode 100644
index a9cf5e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_4.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v8, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.java
deleted file mode 100644
index 4e395c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_4 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.d
deleted file mode 100644
index 1e08af2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_5.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v8, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.java
deleted file mode 100644
index 1b7c65f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_5 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.d
deleted file mode 100644
index bfcfcc2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_6.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v8, 127
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.java
deleted file mode 100644
index 6a723c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_6 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.d
deleted file mode 100644
index fe88ffb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_7.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 9
-
- mul-int/lit8 v0, v9, 12
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.java
deleted file mode 100644
index 34f5fde..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_7 {
-
- public int run(int a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.d
deleted file mode 100644
index fc6ec8a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_8.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 9
-
- mul-int/lit8 v0, v7, 123
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.java
deleted file mode 100644
index 8fb46ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_8 {
-
- public int run(double a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.d
deleted file mode 100644
index 943b9ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_int_lit8_9.java
-.class public dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 9
-
- mul-int/lit8 v0, v7, 123
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.java
deleted file mode 100644
index c7ebd3d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_int_lit8.d;
-
-public class T_mul_int_lit8_9 {
-
- public int run(long a) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/Test_mul_long.java b/tools/vm-tests/src/dot/junit/opcodes/mul_long/Test_mul_long.java
deleted file mode 100644
index 1abf57e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/Test_mul_long.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_long.d.T_mul_long_1;
-import dot.junit.opcodes.mul_long.d.T_mul_long_3;
-
-public class Test_mul_long extends DxTestCase {
-
- /**
- * @title Arguments = 222000000000l, 5000000000l
- */
- public void testN1() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(3195355577426903040l, t.run(222000000000l, 5000000000l));
- }
-
- /**
- * @title Arguments = -123456789l, 123456789l
- */
- public void testN2() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(-15241578750190521l, t.run(-123456789l, 123456789l));
- }
-
- /**
- * @title Arguments = -123456789l, -123456789l
- */
- public void testN3() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(15241578750190521l, t.run(-123456789l, -123456789l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this multiplication of long and long makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_mul_long_3 t = new T_mul_long_3();
- try {
- t.run(500000l, 2.7d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Long.MAX_VALUE
- */
- public void testB1() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(0, t.run(0, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, 1
- */
- public void testB2() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(9223372036854775807L, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1
- */
- public void testB3() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, Long.MIN_VALUE
- */
- public void testB4() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MAX_VALUE,
- Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, -1
- */
- public void testB6() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(-9223372036854775807L, t.run(Long.MAX_VALUE, -1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, -1
- */
- public void testB7() {
- T_mul_long_1 t = new T_mul_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, -1));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long * int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float * long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference * long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.d
deleted file mode 100644
index de4736d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_1.java
-.class public dot.junit.opcodes.mul_long.d.T_mul_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- mul-long v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.java
deleted file mode 100644
index 5cb0074..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_long.d;
-
-public class T_mul_long_1 {
-
- public long run(long a, long b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_2.d
deleted file mode 100644
index 4e0d25c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2.java
-.class public dot.junit.opcodes.mul_long.d.T_mul_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- mul-long v0, v12, v14
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.d
deleted file mode 100644
index f2faf7d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_3.java
-.class public dot.junit.opcodes.mul_long.d.T_mul_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- mul-long v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.java b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.java
deleted file mode 100644
index ab7743f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_long.d;
-
-public class T_mul_long_3 {
-
- public long run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_4.d
deleted file mode 100644
index bd62f75..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_4.java
-.class public dot.junit.opcodes.mul_long.d.T_mul_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 14
-
- mul-long v0, v11, v13
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_5.d
deleted file mode 100644
index 3d1d09e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_5.java
-.class public dot.junit.opcodes.mul_long.d.T_mul_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FJ)J
-.limit regs 14
-
- mul-long v0, v11, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_6.d
deleted file mode 100644
index 656ec8c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long/d/T_mul_long_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_6.java
-.class public dot.junit.opcodes.mul_long.d.T_mul_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- mul-long v0, v9, v12
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java
deleted file mode 100644
index 3996c60..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_1;
-import dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_3;
-
-public class Test_mul_long_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 222000000000l, 5000000000l
- */
- public void testN1() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(3195355577426903040l, t.run(222000000000l, 5000000000l));
- }
-
- /**
- * @title Arguments = -123456789l, 123456789l
- */
- public void testN2() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(-15241578750190521l, t.run(-123456789l, 123456789l));
- }
-
- /**
- * @title Arguments = -123456789l, -123456789l
- */
- public void testN3() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(15241578750190521l, t.run(-123456789l, -123456789l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this multiplication of long and long makes no sense but shall not crash the VM.
- */
-
- public void testN4() {
- T_mul_long_2addr_3 t = new T_mul_long_2addr_3();
- try {
- t.run(500000l, 2.7d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Long.MAX_VALUE
- */
- public void testB1() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(0, t.run(0, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, 1
- */
- public void testB2() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(9223372036854775807L, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1
- */
- public void testB3() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, Long.MIN_VALUE
- */
- public void testB4() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(Long.MAX_VALUE,
- Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, -1
- */
- public void testB6() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(-9223372036854775807L, t.run(Long.MAX_VALUE, -1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, -1
- */
- public void testB7() {
- T_mul_long_2addr_1 t = new T_mul_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, -1));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long * int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float * long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference * long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.d
deleted file mode 100644
index 1175bf4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2addr_1.java
-.class public dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- mul-long/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.java
deleted file mode 100644
index 886761f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_long_2addr.d;
-
-public class T_mul_long_2addr_1 {
-
- public long run(long a, long b) {
- return a*b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2.d
deleted file mode 100644
index c044257..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2addr_2.java
-.class public dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- mul-long/2addr v12, v14
- return-wide v12
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.d
deleted file mode 100644
index 6735fe5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2addr_3.java
-.class public dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- mul-long/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.java b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.java
deleted file mode 100644
index 122cf54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.mul_long_2addr.d;
-
-public class T_mul_long_2addr_3 {
-
- public long run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4.d
deleted file mode 100644
index e708710..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2addr_4.java
-.class public dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 14
-
- mul-long/2addr v11, v13
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5.d
deleted file mode 100644
index 365e8ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2addr_5.java
-.class public dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FJ)J
-.limit regs 14
-
- mul-long/2addr v11, v12
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6.d
deleted file mode 100644
index bd6d465..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_mul_long_2addr_6.java
-.class public dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- mul-long/2addr v9, v12
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/Test_neg_double.java b/tools/vm-tests/src/dot/junit/opcodes/neg_double/Test_neg_double.java
deleted file mode 100644
index 53fe02b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/Test_neg_double.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.neg_double.d.T_neg_double_1;
-import dot.junit.opcodes.neg_double.d.T_neg_double_4;
-
-public class Test_neg_double extends DxTestCase {
-
- /**
- * @title Argument = 1
- */
- public void testN1() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(-1d, t.run(1d));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN2() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(1d, t.run(-1d));
- }
-
- /**
- * @title Argument = +0
- */
- public void testN3() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(-0d, t.run(+0d));
- }
-
- /**
- * @title Argument = -2.7
- */
- public void testN4() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(2.7d, t.run(-2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of long and double makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_neg_double_4 t = new T_neg_double_4();
- try {
- t.run(500000l);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Argument = Double.NaN
- */
- public void testB1() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(Double.NaN, t.run(Double.NaN));
- }
-
- /**
- * @title Argument = Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Argument = Double.POSITIVE_INFINITY
- */
- public void testB3() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Argument = Double.MAX_VALUE
- */
- public void testB4() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(-1.7976931348623157E308d, t.run(Double.MAX_VALUE));
- }
-
- /**
- * @title Argument = Double.MIN_VALUE
- */
- public void testB5() {
- T_neg_double_1 t = new T_neg_double_1();
- assertEquals(-4.9E-324d, t.run(Double.MIN_VALUE));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.d
deleted file mode 100644
index b094774..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_double_1.java
-.class public dot.junit.opcodes.neg_double.d.T_neg_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)D
-.limit regs 8
-
- neg-double v0, v6
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.java
deleted file mode 100644
index dcf3da6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_double.d;
-
-public class T_neg_double_1 {
-
- public double run(double d) {
- return -d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_2.d
deleted file mode 100644
index a99ecff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_double_2.java
-.class public dot.junit.opcodes.neg_double.d.T_neg_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)D
-.limit regs 8
-
- neg-double v0, v8
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_3.d
deleted file mode 100644
index 26d6715..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_double_3.java
-.class public dot.junit.opcodes.neg_double.d.T_neg_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)D
-.limit regs 8
-
- neg-double v0, v7
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.d
deleted file mode 100644
index d7a51d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_double_4.java
-.class public dot.junit.opcodes.neg_double.d.T_neg_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)D
-.limit regs 8
-
- neg-double v0, v6
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.java b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.java
deleted file mode 100644
index d7507ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_double.d;
-
-public class T_neg_double_4 {
-
- public double run(long d) {
- return -d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_5.d
deleted file mode 100644
index b8cbb4b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_double_5.java
-.class public dot.junit.opcodes.neg_double.d.T_neg_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)D
-.limit regs 8
-
- neg-double v0, v7
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_6.d
deleted file mode 100644
index 33e252a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_double/d/T_neg_double_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_neg_double_6.java
-.class public dot.junit.opcodes.neg_double.d.T_neg_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)D
-.limit regs 8
-
- neg-double v0, v5
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/Test_neg_float.java b/tools/vm-tests/src/dot/junit/opcodes/neg_float/Test_neg_float.java
deleted file mode 100644
index cfd7edf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/Test_neg_float.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.neg_float.d.T_neg_float_1;
-import dot.junit.opcodes.neg_float.d.T_neg_float_6;
-
-public class Test_neg_float extends DxTestCase {
-
- /**
- * @title Argument = 1
- */
- public void testN1() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(-1f, t.run(1f));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN2() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(1f, t.run(-1f));
- }
-
- /**
- * @title Argument = +0
- */
- public void testN3() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(-0f, t.run(+0f));
- }
-
- /**
- * @title Argument = -2.7
- */
- public void testN4() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(2.7f, t.run(-2.7f));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_neg_float_6 t = new T_neg_float_6();
- try {
- t.run(5);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Float.NaN
- */
- public void testB1() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(Float.NaN, t.run(Float.NaN));
- }
-
- /**
- * @title Argument = Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Argument = Float.POSITIVE_INFINITY
- */
- public void testB3() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Argument = Float.MAX_VALUE
- */
- public void testB4() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(-3.4028235E38f, t.run(Float.MAX_VALUE));
- }
-
- /**
- * @title Argument = Float.MIN
- */
- public void testB5() {
- T_neg_float_1 t = new T_neg_float_1();
- assertEquals(-1.4E-45f, t.run(Float.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.d
deleted file mode 100644
index 3259f41..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_float_1.java
-.class public dot.junit.opcodes.neg_float.d.T_neg_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)F
-.limit regs 5
-
- neg-float v0, v4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.java
deleted file mode 100644
index 9709099..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_float.d;
-
-public class T_neg_float_1 {
-
- public float run(float d) {
- return -d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_2.d
deleted file mode 100644
index 966cbe7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_float_2.java
-.class public dot.junit.opcodes.neg_float.d.T_neg_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)F
-.limit regs 5
-
- neg-float v0, v5
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_3.d
deleted file mode 100644
index 6c6be2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_float_3.java
-.class public dot.junit.opcodes.neg_float.d.T_neg_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)F
-.limit regs 5
-
- neg-float v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_4.d
deleted file mode 100644
index 3b9c963..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_float_4.java
-.class public dot.junit.opcodes.neg_float.d.T_neg_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)F
-.limit regs 5
-
- neg-float v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_5.d
deleted file mode 100644
index 7a391f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_neg_float_5.java
-.class public dot.junit.opcodes.neg_float.d.T_neg_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)F
-.limit regs 5
-
- neg-float v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.d
deleted file mode 100644
index 897725b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_float_6.java
-.class public dot.junit.opcodes.neg_float.d.T_neg_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)F
-.limit regs 5
-
- neg-float v0, v4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.java b/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.java
deleted file mode 100644
index f597964..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_float.d;
-
-public class T_neg_float_6 {
-
- public float run(int d) {
- return -d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/Test_neg_int.java b/tools/vm-tests/src/dot/junit/opcodes/neg_int/Test_neg_int.java
deleted file mode 100644
index 817e03a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/Test_neg_int.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.neg_int.d.T_neg_int_1;
-import dot.junit.opcodes.neg_int.d.T_neg_int_2;
-import dot.junit.opcodes.neg_int.d.T_neg_int_7;
-
-public class Test_neg_int extends DxTestCase {
-
- /**
- * @title Argument = 1
- */
- public void testN1() {
- T_neg_int_1 t = new T_neg_int_1();
- assertEquals(-1, t.run(1));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN2() {
- T_neg_int_1 t = new T_neg_int_1();
- assertEquals(1, t.run(-1));
- }
-
- /**
- * @title Argument = 32768
- */
- public void testN3() {
- T_neg_int_1 t = new T_neg_int_1();
- assertEquals(-32768, t.run(32768));
- }
-
- /**
- * @title Argument = 0
- */
- public void testN4() {
- T_neg_int_1 t = new T_neg_int_1();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Check that -x == (~x + 1)
- */
- public void testN5() {
- T_neg_int_2 t = new T_neg_int_2();
- assertTrue(t.run(5));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_neg_int_7 t = new T_neg_int_7();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB1() {
- T_neg_int_1 t = new T_neg_int_1();
- assertEquals(0x80000001, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB2() {
- T_neg_int_1 t = new T_neg_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.d
deleted file mode 100644
index 0ff47de..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_int_1.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- neg-int v0, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.java
deleted file mode 100644
index fc2a24b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_int.d;
-
-public class T_neg_int_1 {
-
- public int run(int d) {
- return -d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.d
deleted file mode 100644
index f66368b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.d
+++ /dev/null
@@ -1,29 +0,0 @@
-.source T_neg_int_2.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)Z
-.limit regs 7
-
- neg-int v4, v6
-
- not-int v3, v6
- add-int/lit8 v2, v3, 1
-
- if-eq v4, v2, Label1
- const/4 v1, 0
-
-Label15:
- return v1
-Label1:
- const/4 v1, 1
- goto Label15
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.java b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.java
deleted file mode 100644
index f37b31d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_int.d;
-
-public class T_neg_int_2 {
-
- public boolean run(int d) {
- return -d == (~d + 1);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_3.d
deleted file mode 100644
index 90c16f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_int_3.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- neg-int v0, v5
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_4.d
deleted file mode 100644
index 4d2c14b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_int_4.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 5
-
- neg-int v0, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_5.d
deleted file mode 100644
index aa67eff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_int_5.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 5
-
- neg-int v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_6.d
deleted file mode 100644
index af24f55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_neg_int_6.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- neg-int v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.d b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.d
deleted file mode 100644
index b1fc23d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_int_7.java
-.class public dot.junit.opcodes.neg_int.d.T_neg_int_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- neg-int v0, v4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.java b/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.java
deleted file mode 100644
index 24e130c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_int.d;
-
-public class T_neg_int_7 {
-
- public int run(float d) {
- return -(int)d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/Test_neg_long.java b/tools/vm-tests/src/dot/junit/opcodes/neg_long/Test_neg_long.java
deleted file mode 100644
index f731c64..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/Test_neg_long.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.neg_long.d.T_neg_long_1;
-import dot.junit.opcodes.neg_long.d.T_neg_long_2;
-import dot.junit.opcodes.neg_long.d.T_neg_long_4;
-
-public class Test_neg_long extends DxTestCase {
-
- /**
- * @title Argument = 123123123272432432l
- */
- public void testN1() {
- T_neg_long_1 t = new T_neg_long_1();
- assertEquals(-123123123272432432l, t.run(123123123272432432l));
- }
-
- /**
- * @title Argument = 1
- */
- public void testN2() {
- T_neg_long_1 t = new T_neg_long_1();
- assertEquals(-1l, t.run(1l));
- }
-
- /**
- * @title Argument = -1
- */
- public void testN3() {
- T_neg_long_1 t = new T_neg_long_1();
- assertEquals(1l, t.run(-1l));
- }
-
- /**
- * @title Check that -x == (~x + 1)
- */
- public void testN4() {
- T_neg_long_2 t = new T_neg_long_2();
- assertTrue(t.run(15l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of long and double makes no sense but shall not crash the VM.
- */
-
- public void testN5() {
- T_neg_long_4 t = new T_neg_long_4();
- try {
- t.run(1.23d);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Argument = 0
- */
- public void testB1() {
- T_neg_long_1 t = new T_neg_long_1();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Argument = Long.MAX_VALUE
- */
- public void testB2() {
- T_neg_long_1 t = new T_neg_long_1();
- assertEquals(-9223372036854775807L, t.run(Long.MAX_VALUE));
- }
-
- /**
- * @title Argument = Long.MIN_VALUE
- */
- public void testB3() {
- T_neg_long_1 t = new T_neg_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.d
deleted file mode 100644
index 7973f10..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_long_1.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 8
-
- neg-long v0, v6
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.java
deleted file mode 100644
index dea3c8c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_long.d;
-
-public class T_neg_long_1 {
-
- public long run(long d) {
- return -d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.d
deleted file mode 100644
index 03891af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-.source T_neg_long_2.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)Z
-.limit regs 14
-
- neg-long v10, v12
-
- not-long v8, v12
- const-wide v6, 1
- add-long v4, v6, v8
-
- cmp-long v3, v4, v10
- const/4 v1, 0
- if-eq v1, v3, Label1
- const/4 v0, 0
-
-Label15:
- return v0
-Label1:
- const/4 v0, 1
- goto Label15
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.java
deleted file mode 100644
index dcf67e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_long.d;
-
-public class T_neg_long_2 {
-
- public boolean run(long d) {
- return -d == (~d + 1);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_3.d
deleted file mode 100644
index ab92394..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_long_3.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 8
-
- neg-long v0, v8
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.d
deleted file mode 100644
index 98fe8da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_long_4.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)J
-.limit regs 8
-
- neg-long v0, v6
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.java b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.java
deleted file mode 100644
index 20631a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.neg_long.d;
-
-public class T_neg_long_4 {
-
- public long run(double d) {
- return -(long)d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_5.d
deleted file mode 100644
index bd3a364..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_long_5.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 8
-
- neg-long v0, v7
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_6.d
deleted file mode 100644
index a936135..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_long_6.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 8
-
- neg-long v0, v7
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_7.d b/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_7.d
deleted file mode 100644
index 66af380..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/neg_long/d/T_neg_long_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_neg_long_7.java
-.class public dot.junit.opcodes.neg_long.d.T_neg_long_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 8
-
- neg-long v0, v5
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/TestStubs.java
deleted file mode 100644
index 587b4d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/TestStubs.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array;
-
-// package access to trigger IllegalAccessError in testVFE8
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/Test_new_array.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/Test_new_array.java
deleted file mode 100644
index 44aedaa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/Test_new_array.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.new_array.d.T_new_array_1;
-import dot.junit.opcodes.new_array.d.T_new_array_10;
-import dot.junit.opcodes.new_array.d.T_new_array_11;
-import dot.junit.opcodes.new_array.d.T_new_array_2;
-import dot.junit.opcodes.new_array.d.T_new_array_3;
-
-public class Test_new_array extends DxTestCase {
-
- /**
- * @title Array of ints
- */
- public void testN1() {
- T_new_array_1 t = new T_new_array_1();
- int[] r = t.run(10);
- int l = r.length;
- assertEquals(10, l);
-
- // check default initialization
- for (int i = 0; i < l; i++) {
- assertEquals(0, r[i]);
- }
-
- }
-
- /**
- * @title Array of booleans
- */
- public void testN2() {
- T_new_array_2 t = new T_new_array_2();
- boolean[] r = t.run(10);
- int l = r.length;
- assertEquals(10, l);
-
- // check default initialization
- for (int i = 0; i < l; i++) {
- assertFalse(r[i]);
- }
- }
-
- /**
- * @title Array of Objects
- */
- public void testN3() {
- T_new_array_3 t = new T_new_array_3();
- Object[] r = t.run(10);
- int l = r.length;
- assertEquals(10, l);
-
- // check default initialization
- for (int i = 0; i < l; i++) {
- assertNull(r[i]);
- }
- }
-
- /**
- * @title Array size = 0
- */
- public void testB1() {
- T_new_array_1 t = new T_new_array_1();
- int[] r = t.run(0);
- assertNotNull(r);
- assertEquals(0, r.length);
- }
-
- /**
- * @title expected NegativeArraySizeException
- */
- public void testE1() {
- T_new_array_2 t = new T_new_array_2();
- try {
- t.run(-1);
- fail("expected NegativeArraySizeException");
- } catch (NegativeArraySizeException nase) {
- // expected
- }
- }
-
-
- /**
- * @constraint B1
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title size argument - long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title size argument - reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A19
- * @title constant pool index
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A22
- * @title attempt to create object
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A20
- * @title array of more than 255 dimensions
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to instantiate array of non-existent class.
- */
- public void testVFE7() {
- try {
- new T_new_array_11().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to instantiate array of inaccessible class.
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.new_array.TestStubs
- try {
- new T_new_array_10().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_1.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_1.d
deleted file mode 100644
index e681faf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_1.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[I
-.limit regs 5
-
- new-array v0, v4, [I
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_1.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_1.java
deleted file mode 100644
index 7455164..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array.d;
-
-public class T_new_array_1 {
-
- public int[] run(int sz) {
- return new int[sz];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_10.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_10.d
deleted file mode 100644
index 4c99085..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_10.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[Ljava/lang/Object;
-.limit regs 5
-
- const v0, 3
- new-array v0, v0, [Ldot/junit/opcodes/new_array/TestStubs;
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_10.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_10.java
deleted file mode 100644
index 81b7a7e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_10.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array.d;
-
-public class T_new_array_10 {
- public Object[] run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_11.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_11.d
deleted file mode 100644
index 3f0b3da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_11.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_11.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()[Ljava/lang/Object;
-.limit regs 5
-
- const v0, 3
- new-array v0, v0, [Ljava/lang/ObjectNNN;
-
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_11.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_11.java
deleted file mode 100644
index e37e1ec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_11.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array.d;
-
-public class T_new_array_11 {
- public Object[] run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_2.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_2.d
deleted file mode 100644
index de7b8dd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_2.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[Z
-.limit regs 5
-
- new-array v0, v4, [Z
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_2.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_2.java
deleted file mode 100644
index 27103b1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array.d;
-
-public class T_new_array_2 {
-
- public boolean[] run(int sz) {
- return new boolean[sz];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_3.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_3.d
deleted file mode 100644
index d560ca6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_3.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[Ljava/lang/Object;
-.limit regs 5
-
- new-array v0, v4, [Ljava/lang/Object;
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_3.java b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_3.java
deleted file mode 100644
index 47a28c3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_array.d;
-
-public class T_new_array_3 {
-
- public Object[] run(int sz) {
- return new Object[sz];
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_4.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_4.d
deleted file mode 100644
index 2f75ff1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_4.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[I
-.limit regs 5
-
- new-array v5, v4, [I
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_5.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_5.d
deleted file mode 100644
index 9ce7d3e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_5.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[I
-.limit regs 5
-
- const-wide v3, 1
- new-array v0, v3, [I
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_6.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_6.d
deleted file mode 100644
index 885beba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_6.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[I
-.limit regs 5
-
- new-array v0, v4, [I
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_6.dfh b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_6.dfh
deleted file mode 100644
index 0794b49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_6.dfh
+++ /dev/null
@@ -1,270 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/new_array/d/T_new_array_6.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/new_array/d/T_new_array_6.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 0877446e
- 6E 44 77 08
-// parsed: offset 12, len 20: signature : 7016...e092
- 70 16 D1 71 A3 86 82 A2 90 FA CB 70 1E 3F F9 18 2B 71 E0 92
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 9
- 09 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 5
- 05 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 302 (0x00012e) "<init>"
- 2E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 310 (0x000136) "I"
- 36 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 313 (0x000139) "LI"
- 39 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 317 (0x00013d) "Ldot/junit/opcodes/new_array/d/T_new_array_6;"
- 3D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 364 (0x00016c) "Ljava/lang/Object;"
- 6C 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 384 (0x000180) "T_new_array_6.java"
- 80 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 404 (0x000194) "V"
- 94 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 407 (0x000197) "[I"
- 97 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 411 (0x00019b) "run"
- 9B 01 00 00
-
-// type_ids:
-// parsed: offset 148, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 152, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/new_array/d/T_new_array_6;"
- 03 00 00 00
-// parsed: offset 156, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 160, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-// parsed: offset 164, len 4: [4] descriptor_idx: 7 (0x000007) "[I"
- 07 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 2 (0x000002) "LI"
-// return_type_idx: 4 (0x000004) "[I"
-// parameters_off: 296 (0x000128)
- 02 00 00 00 04 00 00 00 28 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 8 (0x000008) "run"
- 01 00 01 00 08 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/new_array/d/T_new_array_6;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_new_array_6.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 416 (0x0001a0)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 A0 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.new_array.d.T_new_array_6.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.new_array.d.T_new_array_6.run"
- // parsed: offset 272, len 2: registers_size: 5
- 05 00
- // parsed: offset 274, len 2: ins_size: 2
- 02 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: new-array v0, v4, [I // class@0004
-//@mod 23 40 04 00
- 23 40 04 01
- // parsed: offset 292, len 2: |0002: return-object v0
- 11 00
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// TYPE_LIST
- // parsed: offset 296, len 4: size: 1
- 01 00 00 00
- // parsed: offset 300, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 302, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 310, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 313, len 4: TYPE_STRING_DATA_ITEM [2] "LI"
- 02 4C 49 00
-// parsed: offset 317, len 47: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/new_array/d/T_new_array_6;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 6E 65 77 5F 61 72 72 61 79 2F 64 2F 54 5F 6E 65 77 5F 61 72 72 61 79 5F 36 3B 00
-// parsed: offset 364, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 384, len 20: TYPE_STRING_DATA_ITEM [5] "T_new_array_6.java"
- 12 54 5F 6E 65 77 5F 61 72 72 61 79 5F 36 2E 6A 61 76 61 00
-// parsed: offset 404, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 407, len 4: TYPE_STRING_DATA_ITEM [7] "[I"
- 02 5B 49 00
-// parsed: offset 411, len 5: TYPE_STRING_DATA_ITEM [8] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/new_array/d/T_new_array_6;"
- // parsed: offset 416, len 1: static_fields_size: 0
- 00
- // parsed: offset 417, len 1: instance_fields_size: 0
- 00
- // parsed: offset 418, len 1: direct_methods_size: 1
- 01
- // parsed: offset 419, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 421, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 424, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 426, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 427, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 428, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 430, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 9
- // offset: 112 (0x000070)
- 01 00 00 00 09 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 5
- // offset: 148 (0x000094)
- 02 00 00 00 05 00 00 00 94 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 168 (0x0000a8)
- 03 00 00 00 02 00 00 00 A8 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 296 (0x000128)
- 01 10 00 00 01 00 00 00 28 01 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 9
- // offset: 302 (0x00012e)
- 02 20 00 00 09 00 00 00 2E 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 416 (0x0001a0)
- 00 20 00 00 01 00 00 00 A0 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_7.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_7.d
deleted file mode 100644
index f6f2588..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_7.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[Ljava/lang/Object;
-.limit regs 5
-
- new-array v0, v4, java/lang/Object
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_8.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_8.d
deleted file mode 100644
index a221fc2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_8.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[Ljava/lang/Object;
-.limit regs 5
-
- new-array v0, v4, [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[Ljava/lang/Object;
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_9.d b/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_9.d
deleted file mode 100644
index 914322a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_array/d/T_new_array_9.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_array_9.java
-.class public dot.junit.opcodes.new_array.d.T_new_array_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)[I
-.limit regs 5
-
- new-array v0, v3, [I
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/TTestClass.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/TTestClass.java
deleted file mode 100644
index 679e665..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/TTestClass.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance;
-
-public class TTestClass {
-
- @SuppressWarnings("unused")
- private class TestStub {
- // used by testE3
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/TestStubs.java
deleted file mode 100644
index ca22946..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/TestStubs.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance;
-
-// package access to trigger IllegalAccessError in testVFE5
-class TestStubs {
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/Test_new_instance.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/Test_new_instance.java
deleted file mode 100644
index d994f65..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/Test_new_instance.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.new_instance.d.T_new_instance_1;
-import dot.junit.opcodes.new_instance.d.T_new_instance_3;
-import dot.junit.opcodes.new_instance.d.T_new_instance_4;
-import dot.junit.opcodes.new_instance.d.T_new_instance_5;
-import dot.junit.opcodes.new_instance.d.T_new_instance_8;
-import dot.junit.opcodes.new_instance.d.T_new_instance_9;
-
-
-public class Test_new_instance extends DxTestCase {
-
- /**
- * @title new String
- */
- public void testN1() {
- T_new_instance_1 t = new T_new_instance_1();
- String s = t.run();
- assertNotNull(s);
- assertEquals(0, s.compareTo("abc"));
- }
-
- /**
- * @title class initialization throws exception
- */
- public void testE1() {
- try {
- T_new_instance_3.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A21
- * @title attempt to instantiate interface
- */
- public void testE4() {
- //@uses dot.junit.opcodes.new_instance.d.TestAbstractClass
- //@uses dot.junit.opcodes.new_instance.d.T_new_instance_8
- T_new_instance_8 t = new T_new_instance_8();
- try {
- t.run();
- fail("expected InstantiationError");
- } catch (InstantiationError ie) {
- // expected
- }
- }
-
- /**
- * @constraint A21
- * @title attempt to instantiate abstract
- * class
- */
- public void testE5() {
- //@uses dot.junit.opcodes.new_instance.d.TestAbstractClass
- //@uses dot.junit.opcodes.new_instance.d.T_new_instance_9
- T_new_instance_9 t = new T_new_instance_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error iae) {
- // expected
- }
- }
-
- /**
- * @constraint A18
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A21
- * @title attempt to create array using new
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B6
- * @title Attempt to access uninitialized class (before <init> is
- * called
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to instantiate array of inaccessible class.
- */
- public void testVFE5() {
- //@uses dot.junit.opcodes.new_instance.TestStubs
- //@uses dot.junit.opcodes.new_instance.d.T_new_instance_4
- try {
- new T_new_instance_4().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to instantiate array of non-existent class.
- */
- public void testVFE6() {
- try {
- new T_new_instance_5().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint B7
- * @title A register which holds the result of a new-instance instruction must not be used
- * if the same new-instance instruction is again executed before the instance is initialized
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B7
- * @title A register which holds the result of a new-instance instruction must not be used
- * if the same new-instance instruction is again executed before the instance is initialized
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.d
deleted file mode 100644
index 0cff87a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_1.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 6
-
- new-instance v1, java/lang/String
- const-string v3, "abc"
- invoke-direct {v1, v3}, java/lang/String/<init>(Ljava/lang/String;)V
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.java
deleted file mode 100644
index c8f4878..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_1 {
-
- public String run() {
- return new String("abc");
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_10.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_10.d
deleted file mode 100644
index cd9096d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_10.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- new-instance v6, java/lang/String
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_11.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_11.d
deleted file mode 100644
index 75fb804..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_11.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_11.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v4, 5
- move-object v1, v5
-Label0:
- move-object v0, v1
- new-instance v1, java/lang/Integer
-
- add-int/lit8 v4, v4, -1
- if-nez v4, Label0
-
- invoke-direct {v1, v4}, java/lang/Integer/<init>(I)V
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_12.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_12.d
deleted file mode 100644
index e4b025e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_12.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_12.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v0, 0
-Label1:
- new-instance v1, java/lang/Integer
- if-nez v0, INIT
- move-object v2, v1
- const v0, 1
- goto Label1
-INIT:
-
- invoke-direct {v1, v0}, java/lang/Integer/<init>(I)V
- invoke-virtual {v2}, java/lang/Integer/toString()Ljava/lang/String;
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_2.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_2.d
deleted file mode 100644
index 2a8eefb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_2.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_2.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_2
-.super java/lang/Object
-
-.field i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static run()I
-.limit regs 5
-
- new-instance v0, dot/junit/opcodes/new_instance/d/T_new_instance_2
-; invoke-direct {v0}, dot/junit/opcodes/new_instance/d/T_new_instance_2/<init>()V
-
- iget v1, v0, dot.junit.opcodes.new_instance.d.T_new_instance_2.i I
-
- return v1
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.d
deleted file mode 100644
index f6cd6fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.d
+++ /dev/null
@@ -1,49 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_3.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_3
-.super java/lang/Object
-
-.field static i I
-
-.method static <clinit>()V
-.limit regs 2
-
- const/16 v0, 123
- const/4 v1, 0
- div-int/lit8 v0, v0, 0
- sput v0, dot.junit.opcodes.new_instance.d.T_new_instance_3.i I
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
-Label5:
- return-void
-.end method
-
-.method public static run()I
-.limit regs 4
-
- new-instance v1, dot/junit/opcodes/new_instance/d/T_new_instance_3
- invoke-direct {v1}, dot/junit/opcodes/new_instance/d/T_new_instance_3/<init>()V
-
- sget v1, dot.junit.opcodes.new_instance.d.T_new_instance_3.i I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.java
deleted file mode 100644
index dd8bb15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_3 {
-
- static int i = 123 / 0;
-
- public static int run() {
- T_new_instance_3 t = new T_new_instance_3();
- return t.i;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.d
deleted file mode 100644
index a92c597..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_4.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/new_instance/TestStubs
-; invoke-direct {v1}, dot/junit/opcodes/new_instance/TestStubs/<init>()V
-; intentionally return v4 ("this")
- return-object v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.java
deleted file mode 100644
index 9ed269f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_4 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.d
deleted file mode 100644
index 4651f6a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_5.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/new_instance/Test_new_instanceNNNNN
-; invoke-direct {v1}, dot/junit/opcodes/new_instance/TTestClass/<init>()V
-; intentionally return v4 ("this")
- return-object v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.java
deleted file mode 100644
index 7c6b0c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_5 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.d
deleted file mode 100644
index 0565aea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_6.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 6
-
- new-instance v1, java/lang/String
- const-string v3, "abc"
- invoke-direct {v1, v3}, java/lang/String/<init>(Ljava/lang/String;)V
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.dfh b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.dfh
deleted file mode 100644
index 91ac7e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.dfh
+++ /dev/null
@@ -1,279 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/new_instance/d/T_new_instance_6.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/new_instance/d/T_new_instance_6.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a36952db
- DB 52 69 A3
-// parsed: offset 12, len 20: signature : 71b1...5136
- 71 B1 EB E5 E0 7E D8 D6 08 9A F1 CD 12 14 9C 8E 6E 4F 51 36
-// parsed: offset 32, len 4: file_size : 624
- 70 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 488 (0x0001e8)
- E8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 10
- 0A 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 3
- 03 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 168 (0x0000a8)
- A8 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 4
- 04 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 236 (0x0000ec)
- EC 00 00 00
-// parsed: offset 104, len 4: data_size : 356
- 64 01 00 00
-// parsed: offset 108, len 4: data_off : 268 (0x00010c)
- 0C 01 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 330 (0x00014a) "<init>"
- 4A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 338 (0x000152) "L"
- 52 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 341 (0x000155) "Ldot/junit/opcodes/new_instance/d/T_new_instance_6;"
- 55 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 394 (0x00018a) "Ljava/lang/Object;"
- 8A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 414 (0x00019e) "Ljava/lang/String;"
- 9E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 434 (0x0001b2) "T_new_instance_6.java"
- B2 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 457 (0x0001c9) "V"
- C9 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 460 (0x0001cc) "VL"
- CC 01 00 00
-// parsed: offset 144, len 4: [8] string_data_off: 464 (0x0001d0) "abc"
- D0 01 00 00
-// parsed: offset 148, len 4: [9] string_data_off: 469 (0x0001d5) "run"
- D5 01 00 00
-
-// type_ids:
-// parsed: offset 152, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/new_instance/d/T_new_instance_6;"
- 02 00 00 00
-// parsed: offset 156, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 160, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/String;"
- 04 00 00 00
-// parsed: offset 164, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 168, len 12: [0]
-// shorty_idx: 1 (0x000001) "L"
-// return_type_idx: 2 (0x000002) "Ljava/lang/String;"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 180, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-// parsed: offset 192, len 12: [2]
-// shorty_idx: 7 (0x000007) "VL"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 324 (0x000144)
- 07 00 00 00 03 00 00 00 44 01 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 204, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 212, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 9 (0x000009) "run"
- 00 00 00 00 09 00 00 00
-// parsed: offset 220, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 228, len 8: [3] class_idx: 2 (0x000002) proto_idx: 2 (0x000002) name_idx: 0 (0x000000) "<init>"
- 02 00 02 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 236, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/new_instance/d/T_new_instance_6;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_new_instance_6.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 474 (0x0001da)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 DA 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.new_instance.d.T_new_instance_6.<init>"
- // parsed: offset 268, len 2: registers_size: 1
- 01 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 1
- 01 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 284, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 290, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.new_instance.d.T_new_instance_6.run"
- // parsed: offset 292, len 2: registers_size: 6
- 06 00
- // parsed: offset 294, len 2: ins_size: 1
- 01 00
- // parsed: offset 296, len 2: outs_size: 2
- 02 00
- // parsed: offset 298, len 2: tries_size: 0
- 00 00
- // parsed: offset 300, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 304, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 308, len 4: |0000: new-instance v1, Ljava/lang/String; // class@0002
-//@mod 22 01 02 00
- 22 01 02 01
- // parsed: offset 312, len 4: |0002: const-string v3, "abc" // string@0008
- 1A 03 08 00
- // parsed: offset 316, len 6: |0004: invoke-direct {v1, v3}, Ljava/lang/String;.<init>:(Ljava/lang/String;)V // method@0003
- 70 20 03 00 31 00
- // parsed: offset 322, len 2: |0007: return-object v1
- 11 01
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 324, len 4: size: 1
- 01 00 00 00
- // parsed: offset 328, len 2: type_item [0] type_idx: 2
- 02 00
-// parsed: offset 330, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 338, len 3: TYPE_STRING_DATA_ITEM [1] "L"
- 01 4C 00
-// parsed: offset 341, len 53: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/new_instance/d/T_new_instance_6;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 6E 65 77 5F 69 6E 73 74 61 6E 63 65 2F 64 2F 54 5F 6E 65 77 5F 69 6E 73 74 61 6E 63 65 5F 36 3B 00
-// parsed: offset 394, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 414, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/String;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 53 74 72 69 6E 67 3B 00
-// parsed: offset 434, len 23: TYPE_STRING_DATA_ITEM [5] "T_new_instance_6.java"
- 15 54 5F 6E 65 77 5F 69 6E 73 74 61 6E 63 65 5F 36 2E 6A 61 76 61 00
-// parsed: offset 457, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 460, len 4: TYPE_STRING_DATA_ITEM [7] "VL"
- 02 56 4C 00
-// parsed: offset 464, len 5: TYPE_STRING_DATA_ITEM [8] "abc"
- 03 61 62 63 00
-// parsed: offset 469, len 5: TYPE_STRING_DATA_ITEM [9] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/new_instance/d/T_new_instance_6;"
- // parsed: offset 474, len 1: static_fields_size: 0
- 00
- // parsed: offset 475, len 1: instance_fields_size: 0
- 00
- // parsed: offset 476, len 1: direct_methods_size: 1
- 01
- // parsed: offset 477, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 478, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 479, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 482, len 2: code_off: 268 (0x00010c)
- 8C 02
- // virtual_methods:
- // method [0]:
- // parsed: offset 484, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 485, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 486, len 2: code_off: 292 (0x000124)
- A4 02
-// map_list:
- // parsed: offset 488, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 492, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 504, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 10
- // offset: 112 (0x000070)
- 01 00 00 00 0A 00 00 00 70 00 00 00
- // parsed: offset 516, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 152 (0x000098)
- 02 00 00 00 04 00 00 00 98 00 00 00
- // parsed: offset 528, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 168 (0x0000a8)
- 03 00 00 00 03 00 00 00 A8 00 00 00
- // parsed: offset 540, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 204 (0x0000cc)
- 05 00 00 00 04 00 00 00 CC 00 00 00
- // parsed: offset 552, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 236 (0x0000ec)
- 06 00 00 00 01 00 00 00 EC 00 00 00
- // parsed: offset 564, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 268 (0x00010c)
- 01 20 00 00 02 00 00 00 0C 01 00 00
- // parsed: offset 576, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 324 (0x000144)
- 01 10 00 00 01 00 00 00 44 01 00 00
- // parsed: offset 588, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 10
- // offset: 330 (0x00014a)
- 02 20 00 00 0A 00 00 00 4A 01 00 00
- // parsed: offset 600, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 474 (0x0001da)
- 00 20 00 00 01 00 00 00 DA 01 00 00
- // parsed: offset 612, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 488 (0x0001e8)
- 00 10 00 00 01 00 00 00 E8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.d
deleted file mode 100644
index f2e7fcf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_7.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- new-instance v1, [Ljava/lang/Object;
-; intentionally return v2 ("this")
- return-object v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.java
deleted file mode 100644
index f93c886..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_7 {
-
- public Object run() {
- return new Object();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.d
deleted file mode 100644
index f474fe9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_8.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/new_instance/d/TestInterface
-; invoke-direct {v1}, dot/junit/opcodes/new_instance/d/TestInterface/<init>()V
-; intentionally return v4 ("this")
- return-object v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.java
deleted file mode 100644
index 1ca9c38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_8 {
-
- public Object run() {
- return new Object();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.d
deleted file mode 100644
index 7af9f46..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_new_instance_9.java
-.class public dot.junit.opcodes.new_instance.d.T_new_instance_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
-Label5:
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/new_instance/d/TestAbstractClass
-; invoke-direct {v1}, dot/junit/opcodes/new_instance/d/TestAbstractClass/<init>()V
-; intentionally return v4 ("this")
- return-object v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.java
deleted file mode 100644
index 9f1d2bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-public class T_new_instance_9 {
-
- public Object run() {
- return new Object();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/TestAbstractClass.d b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/TestAbstractClass.d
deleted file mode 100644
index ea321c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/TestAbstractClass.d
+++ /dev/null
@@ -1,22 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestAbstractClass.java
-.interface public dot.junit.opcodes.new_instance.d.TestInterface
-
-
-.source TestAbstractClass.java
-.class abstract public dot.junit.opcodes.new_instance.d.TestAbstractClass
-.super java/lang/Object
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/TestStubs.java
deleted file mode 100644
index cb28c6a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/new_instance/d/TestStubs.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.new_instance.d;
-
-
-interface TestInterface {
- public abstract void test();
-}
-
-abstract class TestAbstractClass{
-
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/nop/Test_nop.java b/tools/vm-tests/src/dot/junit/opcodes/nop/Test_nop.java
deleted file mode 100644
index 9044e8c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/nop/Test_nop.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.nop;
-
-import dot.junit.DxTestCase;
-import dot.junit.opcodes.nop.d.T_nop_1;
-
-public class Test_nop extends DxTestCase {
- /**
- * @title tests nop
- */
- public void testN1() {
- T_nop_1 t = new T_nop_1();
- // how do we test nop - e.g. initialize some registers and
- // test if nothing has changed
- assertTrue(t.run());
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/nop/d/T_nop_1.d b/tools/vm-tests/src/dot/junit/opcodes/nop/d/T_nop_1.d
deleted file mode 100644
index 59a85e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/nop/d/T_nop_1.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_nop_1.java
-.class public dot.junit.opcodes.nop.d.T_nop_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 3
- move-object v1, v2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 4
- const v1, 12345678
- nop
- nop
- nop
- nop
- nop
- move v3, v1
- nop
- nop
- nop
- if-ne v1, v3, Label1
- const/4 v1, 1
- return v1
-Label1:
- const/4 v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/nop/d/T_nop_1.java b/tools/vm-tests/src/dot/junit/opcodes/nop/d/T_nop_1.java
deleted file mode 100644
index ec16b22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/nop/d/T_nop_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.nop.d;
-
-public class T_nop_1 {
-
- public boolean run() {
- return true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/Test_not_int.java b/tools/vm-tests/src/dot/junit/opcodes/not_int/Test_not_int.java
deleted file mode 100644
index 0960e32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/Test_not_int.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.not_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.not_int.d.T_not_int_1;
-import dot.junit.opcodes.not_int.d.T_not_int_2;
-
-public class Test_not_int extends DxTestCase {
-
- /**
- * @title Argument = 5; 256
- */
- public void testN1() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(-6, t.run(5));
- assertEquals(-257, t.run(256));
- }
-
- /**
- * @title Argument = -5, -256
- */
- public void testN2() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(4, t.run(-5));
- assertEquals(255, t.run(-256));
- }
-
- /**
- * @title Argument = 0xcafe; 0x12c
- */
- public void testN3() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(-0xcaff, t.run(0xcafe));
- assertEquals(-0x12d, t.run(0x12c));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this multiplication of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_not_int_2 t = new T_not_int_2();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB1() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB2() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Argument = 1
- */
- public void testB3() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(-2, t.run(1));
- }
-
- /**
- * @title Argument = 0
- */
- public void testB4() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(-1, t.run(0));
- }
-
- /**
- * @title Argument = -1
- */
- public void testB5() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(0, t.run(-1));
- }
-
- /**
- * @title Argument = Short.MAX_VALUE
- */
- public void testB6() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(Short.MIN_VALUE, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title Argument = Short.MIN_VALUE
- */
- public void testB7() {
- T_not_int_1 t = new T_not_int_1();
- assertEquals(Short.MAX_VALUE, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_1.d
deleted file mode 100644
index 2b04225..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_int_1.java
-.class public dot.junit.opcodes.not_int.d.T_not_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- not-int v0, v4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_1.java
deleted file mode 100644
index b8ac929..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.not_int.d;
-
-public class T_not_int_1 {
-
- public int run(int d) {
- return ~d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_2.d
deleted file mode 100644
index 3e1ff4a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_int_2.java
-.class public dot.junit.opcodes.not_int.d.T_not_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
- not-int v0, v4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_2.java b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_2.java
deleted file mode 100644
index 679acb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.not_int.d;
-
-public class T_not_int_2 {
-
- public int run(float d) {
- return ~(int)d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_3.d
deleted file mode 100644
index a42823e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_int_3.java
-.class public dot.junit.opcodes.not_int.d.T_not_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- not-int v0, v5
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_4.d
deleted file mode 100644
index 1182ead..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_int_4.java
-.class public dot.junit.opcodes.not_int.d.T_not_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 5
-
- not-int v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_5.d
deleted file mode 100644
index a144392..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_int_5.java
-.class public dot.junit.opcodes.not_int.d.T_not_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 5
-
- not-int v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_6.d
deleted file mode 100644
index c22438f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_int/d/T_not_int_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_int_6.java
-.class public dot.junit.opcodes.not_int.d.T_not_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- not-int v0, v3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/Test_not_long.java b/tools/vm-tests/src/dot/junit/opcodes/not_long/Test_not_long.java
deleted file mode 100644
index a40cdd1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/Test_not_long.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.not_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.not_long.d.T_not_long_1;
-import dot.junit.opcodes.not_long.d.T_not_long_2;
-
-public class Test_not_long extends DxTestCase {
-
- /**
- * @title Argument = 500000l
- */
- public void testN1() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(-500001l, t.run(500000l));
- }
-
- /**
- * @title Argument = -500000l
- */
- public void testN2() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(499999l, t.run(-500000l));
- }
-
- /**
- * @title Argument = 0xcafe; 0x12c
- */
- public void testN3() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(-0xcaff, t.run(0xcafe));
- assertEquals(-0x12d, t.run(0x12c));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this multiplication of long and double makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_not_long_2 t = new T_not_long_2();
- try {
- t.run(1.79d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Argument = Long.MAX_VALUE
- */
- public void testB1() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(Long.MIN_VALUE, t.run(Long.MAX_VALUE));
- }
-
- /**
- * @title Argument = Long.MIN_VALUE
- */
- public void testB2() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(Long.MAX_VALUE, t.run(Long.MIN_VALUE));
- }
-
- /**
- * @title Argument = 1l
- */
- public void testB3() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(-2l, t.run(1l));
- }
-
- /**
- * @title Argument = 0l
- */
- public void testB4() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(-1l, t.run(0l));
- }
-
- /**
- * @title Argument = -1l
- */
- public void testB5() {
- T_not_long_1 t = new T_not_long_1();
- assertEquals(0l, t.run(-1l));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_1.d
deleted file mode 100644
index 9d27053..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_long_1.java
-.class public dot.junit.opcodes.not_long.d.T_not_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 8
-
- not-long v0, v6
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_1.java
deleted file mode 100644
index 535d69d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.not_long.d;
-
-public class T_not_long_1 {
-
- public long run(long d) {
- return ~d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_2.d
deleted file mode 100644
index cd253a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_long_2.java
-.class public dot.junit.opcodes.not_long.d.T_not_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)J
-.limit regs 5
-
- not-long v0, v3
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_2.java
deleted file mode 100644
index 9f93955..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.not_long.d;
-
-public class T_not_long_2 {
-
- public long run(double d) {
- return ~(long)d;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_3.d
deleted file mode 100644
index b9eda02..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_long_3.java
-.class public dot.junit.opcodes.not_long.d.T_not_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 5
-
- not-long v0, v5
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_4.d
deleted file mode 100644
index 3ecd0f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_long_4.java
-.class public dot.junit.opcodes.not_long.d.T_not_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)J
-.limit regs 5
-
- not-long v0, v4
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_5.d
deleted file mode 100644
index 31c1dfc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_long_5.java
-.class public dot.junit.opcodes.not_long.d.T_not_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)J
-.limit regs 5
-
- not-long v0, v4
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_6.d
deleted file mode 100644
index 4d511df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/not_long/d/T_not_long_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_not_long_6.java
-.class public dot.junit.opcodes.not_long.d.T_not_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)J
-.limit regs 5
-
- not-long v0, v2
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/Test_opc_const.java b/tools/vm-tests/src/dot/junit/opcodes/opc_const/Test_opc_const.java
deleted file mode 100644
index aa19e6c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/Test_opc_const.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_const;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.opc_const.d.T_opc_const_1;
-import dot.junit.opcodes.opc_const.d.T_opc_const_2;
-
-public class Test_opc_const extends DxTestCase {
- /**
- * @title const v1, 1.54
- */
- public void testN1() {
- T_opc_const_1 t = new T_opc_const_1();
- float a = 1.5f;
- float b = 0.04f;
- assertEquals(a + b, t.run(), 0f);
- assertEquals(1.54f, t.run(), 0f);
- }
-
- /**
- * @title const v254, 20000000
- */
- public void testN2() {
- T_opc_const_2 t = new T_opc_const_2();
- int a = 10000000;
- int b = 10000000;
- assertEquals(a + b, t.run());
- }
-
- /**
- * @constraint B1
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.opc_const.d.T_opc_const_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title When writing to a register that is one half of a register
- * pair, but not touching the other half, the old register pair gets broken up, and the
- * other register involved in it becomes undefined
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.opc_const.d.T_opc_const_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_1.d b/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_1.d
deleted file mode 100644
index 8246f1b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_const_1.java
-.class public dot.junit.opcodes.opc_const.d.T_opc_const_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()F
-.limit regs 3
-
- const v1, 1.54
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_1.java b/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_1.java
deleted file mode 100644
index 1bf4f0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_const.d;
-
-public class T_opc_const_1 {
-
- public float run(){
- return 1.54f;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.d b/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.d
deleted file mode 100644
index d651fe9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_const_2.java
-.class public dot.junit.opcodes.opc_const.d.T_opc_const_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 255
-
- const v254, 20000000
- return v254
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.java b/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.java
deleted file mode 100644
index 07cd52a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_const.d;
-
-public class T_opc_const_2 {
-
- public int run() {
- return 20000000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_3.d b/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_3.d
deleted file mode 100644
index d0065db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_const_3.java
-.class public dot.junit.opcodes.opc_const.d.T_opc_const_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v3, 1234
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_4.d b/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_4.d
deleted file mode 100644
index f2d5697..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_const/d/T_opc_const_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_const_4.java
-.class public dot.junit.opcodes.opc_const.d.T_opc_const_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
- const-wide v0, 1234
- const v1, 1234
-
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java
deleted file mode 100644
index a3558fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_goto;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.opc_goto.d.T_opc_goto_1;
-
-public class Test_opc_goto extends DxTestCase {
- /**
- * @title forward and backward goto. This test also tests constraint C17 allowing to have
- * backward goto as a last opcode in the method.
- */
- public void testN1() {
- T_opc_goto_1 t = new T_opc_goto_1();
- assertEquals(0, t.run(20));
- }
-
- /**
- * @constraint A6
- * @title branch target is inside instruction
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.opc_goto.d.T_opc_goto_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A6
- * @title branch target shall be inside the method
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.opc_goto.d.T_opc_goto_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title zero offset
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.opc_goto.d.T_opc_goto_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.d b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.d
deleted file mode 100644
index e9b75ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_goto_1.java
-.class public dot.junit.opcodes.opc_goto.d.T_opc_goto_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-; test positive offset
- goto Label2
-LabelReturn:
- return v4
-
-Label2:
- add-int/lit8 v4, v4, -1
- if-lez v4, LabelExit
-; test negative offset
- goto Label2
-
-LabelExit:
- goto LabelReturn
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.java b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.java
deleted file mode 100644
index 30c4e74..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_goto.d;
-
-public class T_opc_goto_1 {
-
- public int run(int a) {
- while (a > 0) {
- a--;
- }
- return a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.d b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.d
deleted file mode 100644
index 8cb3602..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_goto_2.java
-.class public dot.junit.opcodes.opc_goto.d.T_opc_goto_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto Label2
-Label2:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.dfh b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.dfh
deleted file mode 100644
index 3917c98..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : cf734093
- 93 40 73 CF
-// parsed: offset 12, len 20: signature : 19a1...8fae
- 19 A1 80 04 F4 E4 1C 91 9B AB 4F FF A1 01 C6 17 E3 C0 8F AE
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 290 (0x000122) "<init>"
- 22 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 298 (0x00012a) "I"
- 2A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 301 (0x00012d) "II"
- 2D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 305 (0x000131) "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_2;"
- 31 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 350 (0x00015e) "Ljava/lang/Object;"
- 5E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 370 (0x000172) "T_opc_goto_2.java"
- 72 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "V"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 392 (0x000188) "run"
- 88 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_2;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 284 (0x00011c)
- 02 00 00 00 00 00 00 00 1C 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_2;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_opc_goto_2.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 397 (0x00018d)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8D 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.opc_goto.d.T_opc_goto_2.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.opc_goto.d.T_opc_goto_2.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 2
- 02 00 00 00
- // insns:
- // parsed: offset 280, len 2: |0000: goto 0001 // +0x0001
-//@mod 28 01
- 28 02
- // parsed: offset 282, len 2: |0001: return v4
- 0F 04
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 284, len 4: size: 1
- 01 00 00 00
- // parsed: offset 288, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 290, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 298, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 301, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 305, len 45: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_2;"
- 2B 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 6F 70 63 5F 67 6F 74 6F 2F 64 2F 54 5F 6F 70 63 5F 67 6F 74 6F 5F 32 3B 00
-// parsed: offset 350, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 370, len 19: TYPE_STRING_DATA_ITEM [5] "T_opc_goto_2.java"
- 11 54 5F 6F 70 63 5F 67 6F 74 6F 5F 32 2E 6A 61 76 61 00
-// parsed: offset 389, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 392, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_2;"
- // parsed: offset 397, len 1: static_fields_size: 0
- 00
- // parsed: offset 398, len 1: instance_fields_size: 0
- 00
- // parsed: offset 399, len 1: direct_methods_size: 1
- 01
- // parsed: offset 400, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 401, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 402, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 405, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 408, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 409, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 411, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 284 (0x00011c)
- 01 10 00 00 01 00 00 00 1C 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 290 (0x000122)
- 02 20 00 00 08 00 00 00 22 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 397 (0x00018d)
- 00 20 00 00 01 00 00 00 8D 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.d b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.d
deleted file mode 100644
index 8edcca6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_goto_3.java
-.class public dot.junit.opcodes.opc_goto.d.T_opc_goto_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto Label2
-Label2:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.dfh
deleted file mode 100644
index 9da5505..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 4d883f57
- 57 3F 88 4D
-// parsed: offset 12, len 20: signature : 16da...c0ad
- 16 DA B2 AB 5C D5 C9 74 71 01 63 17 93 81 6E 18 34 96 C0 AD
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 290 (0x000122) "<init>"
- 22 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 298 (0x00012a) "I"
- 2A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 301 (0x00012d) "II"
- 2D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 305 (0x000131) "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_3;"
- 31 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 350 (0x00015e) "Ljava/lang/Object;"
- 5E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 370 (0x000172) "T_opc_goto_3.java"
- 72 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "V"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 392 (0x000188) "run"
- 88 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_3;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 284 (0x00011c)
- 02 00 00 00 00 00 00 00 1C 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_opc_goto_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 397 (0x00018d)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8D 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.opc_goto.d.T_opc_goto_3.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.opc_goto.d.T_opc_goto_3.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 2
- 02 00 00 00
- // insns:
- // parsed: offset 280, len 2: |0000: goto 0001 // +0x0001
-//@mod 28 01
- 28 10
- // parsed: offset 282, len 2: |0001: return v4
- 0F 04
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 284, len 4: size: 1
- 01 00 00 00
- // parsed: offset 288, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 290, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 298, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 301, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 305, len 45: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_3;"
- 2B 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 6F 70 63 5F 67 6F 74 6F 2F 64 2F 54 5F 6F 70 63 5F 67 6F 74 6F 5F 33 3B 00
-// parsed: offset 350, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 370, len 19: TYPE_STRING_DATA_ITEM [5] "T_opc_goto_3.java"
- 11 54 5F 6F 70 63 5F 67 6F 74 6F 5F 33 2E 6A 61 76 61 00
-// parsed: offset 389, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 392, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_3;"
- // parsed: offset 397, len 1: static_fields_size: 0
- 00
- // parsed: offset 398, len 1: instance_fields_size: 0
- 00
- // parsed: offset 399, len 1: direct_methods_size: 1
- 01
- // parsed: offset 400, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 401, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 402, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 405, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 408, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 409, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 411, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 284 (0x00011c)
- 01 10 00 00 01 00 00 00 1C 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 290 (0x000122)
- 02 20 00 00 08 00 00 00 22 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 397 (0x00018d)
- 00 20 00 00 01 00 00 00 8D 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.d b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.d
deleted file mode 100644
index 6c29f65..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_goto_4.java
-.class public dot.junit.opcodes.opc_goto.d.T_opc_goto_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto Label1
-Label1:
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.dfh
deleted file mode 100644
index 5666601..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 97783f02
- 02 3F 78 97
-// parsed: offset 12, len 20: signature : a610...059a
- A6 10 17 6F A6 2E 7A AE A2 D0 27 EA 5E C8 BF 3E 13 91 05 9A
-// parsed: offset 32, len 4: file_size : 548
- 24 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 412 (0x00019c)
- 9C 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 308
- 34 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 290 (0x000122) "<init>"
- 22 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 298 (0x00012a) "I"
- 2A 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 301 (0x00012d) "II"
- 2D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 305 (0x000131) "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_4;"
- 31 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 350 (0x00015e) "Ljava/lang/Object;"
- 5E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 370 (0x000172) "T_opc_goto_4.java"
- 72 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "V"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 392 (0x000188) "run"
- 88 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_4;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 284 (0x00011c)
- 02 00 00 00 00 00 00 00 1C 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_opc_goto_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 397 (0x00018d)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 8D 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.opc_goto.d.T_opc_goto_4.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.opc_goto.d.T_opc_goto_4.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 2
- 02 00 00 00
- // insns:
- // parsed: offset 280, len 2: |0000: goto 0001 // +0x0001
-//@mod 28 01
- 28 00
- // parsed: offset 282, len 2: |0001: return v4
- 0F 04
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 284, len 4: size: 1
- 01 00 00 00
- // parsed: offset 288, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 290, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 298, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 301, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 305, len 45: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_4;"
- 2B 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 6F 70 63 5F 67 6F 74 6F 2F 64 2F 54 5F 6F 70 63 5F 67 6F 74 6F 5F 34 3B 00
-// parsed: offset 350, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 370, len 19: TYPE_STRING_DATA_ITEM [5] "T_opc_goto_4.java"
- 11 54 5F 6F 70 63 5F 67 6F 74 6F 5F 34 2E 6A 61 76 61 00
-// parsed: offset 389, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 392, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/opc_goto/d/T_opc_goto_4;"
- // parsed: offset 397, len 1: static_fields_size: 0
- 00
- // parsed: offset 398, len 1: instance_fields_size: 0
- 00
- // parsed: offset 399, len 1: direct_methods_size: 1
- 01
- // parsed: offset 400, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 401, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 402, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 405, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 408, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 409, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 411, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 412, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 416, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 428, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 440, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 452, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 464, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 476, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 488, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 500, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 284 (0x00011c)
- 01 10 00 00 01 00 00 00 1C 01 00 00
- // parsed: offset 512, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 290 (0x000122)
- 02 20 00 00 08 00 00 00 22 01 00 00
- // parsed: offset 524, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 397 (0x00018d)
- 00 20 00 00 01 00 00 00 8D 01 00 00
- // parsed: offset 536, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 412 (0x00019c)
- 00 10 00 00 01 00 00 00 9C 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/Test_opc_return.java b/tools/vm-tests/src/dot/junit/opcodes/opc_return/Test_opc_return.java
deleted file mode 100644
index 2fe8323..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/Test_opc_return.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_return;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.opc_return.d.T_opc_return_1;
-import dot.junit.opcodes.opc_return.d.T_opc_return_3;
-
-public class Test_opc_return extends DxTestCase {
- /**
- * @title check that frames are discarded and reinstananted correctly
- */
- public void testN1() {
- T_opc_return_1 t = new T_opc_return_1();
- assertEquals(123456, t.run());
- }
-
-
- /**
- * @title Method is synchronized but thread is not monitor owner
- */
- public void testE1() {
- T_opc_return_3 t = new T_opc_return_3();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
- }
-
-
- /**
- * @constraint B11
- * @title method's return type - long
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title method's return type - reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title return on wide register pair
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.d b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.d
deleted file mode 100644
index 29ae5bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.d
+++ /dev/null
@@ -1,70 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_return_1.java
-.class public dot.junit.opcodes.opc_return.d.T_opc_return_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 10
-
- const v1, 1
- const v2, 2
- const v3, 3
-
- const v4, 0xdddd
-
- invoke-static {}, dot/junit/opcodes/opc_return/d/T_opc_return_1/test()I
- move-result v6
-
- if-ne v4, v6, Label0
-
- const v4, 1
- if-ne v1, v4, Label0
-
- const v4, 2
- if-ne v2, v4, Label0
-
- const v4, 3
- if-ne v3, v4, Label0
-
- const v0, 123456
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-.method private static test()I
-.limit regs 6
-
- const v0, 9999
- const v1, 0xaaa
- const v2, 0xbbbb
- const v3, 0xcccc
-
- const v4, 0xdddd
- return v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.java b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.java
deleted file mode 100644
index 2f5029d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_return.d;
-
-public class T_opc_return_1 {
-
- public int run() {
- test();
- return 123456;
- }
-
- private static int test() {
- int a = 0xaaaa;
- int b = 0xbbbb;
- int c = 0xcccc;
- return 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d
deleted file mode 100644
index 2410da3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_return_3.java
-.class public dot.junit.opcodes.opc_return.d.T_opc_return_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private declared_synchronized test()F
-.limit regs 4
-
- monitor-exit v3
- const v0, 1.0
- return v0
-.end method
-
-
-
-.method public run()Z
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/opc_return/d/T_opc_return_3/test()F
-
- const v0, 1
- return v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.java b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.java
deleted file mode 100644
index 6b93391..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_return.d;
-
-public class T_opc_return_3 {
-
- private synchronized long test() {
- return 1;
- }
-
- public boolean run() {
- test();
- return true;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_5.d b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_5.d
deleted file mode 100644
index 884ce2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_return_5.java
-.class public dot.junit.opcodes.opc_return.d.T_opc_return_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 6
-
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_6.d b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_6.d
deleted file mode 100644
index c19f760..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_return_6.java
-.class public dot.junit.opcodes.opc_return.d.T_opc_return_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 6
-
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_7.d b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_7.d
deleted file mode 100644
index cec1f9c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_return_7.java
-.class public dot.junit.opcodes.opc_return.d.T_opc_return_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- return v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_8.d b/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_8.d
deleted file mode 100644
index 1ca6832..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_return/d/T_opc_return_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_return_8.java
-.class public dot.junit.opcodes.opc_return.d.T_opc_return_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- const-wide v0, 0
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java
deleted file mode 100644
index 5055336..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.opc_throw.d.T_opc_throw_1;
-import dot.junit.opcodes.opc_throw.d.T_opc_throw_12;
-import dot.junit.opcodes.opc_throw.d.T_opc_throw_2;
-import dot.junit.opcodes.opc_throw.d.T_opc_throw_4;
-import dot.junit.opcodes.opc_throw.d.T_opc_throw_5;
-import dot.junit.opcodes.opc_throw.d.T_opc_throw_8;
-
-public class Test_opc_throw extends DxTestCase {
- /**
- * @title check throw functionality. This test also tests constraint C17 allowing to have
- * throw as a last opcode in the method.
- */
- public void testN1() {
- T_opc_throw_1 t = new T_opc_throw_1();
- try {
- t.run();
- fail("must throw a RuntimeException");
- } catch (RuntimeException re) {
- // expected
- }
- }
-
- /**
- * @title Throwing of the objectref on the class Throwable
- */
- public void testN2() {
- T_opc_throw_2 t = new T_opc_throw_2();
- try {
- t.run();
- fail("must throw a Throwable");
- } catch (Throwable e) {
- // expected
- }
- }
-
- /**
- * @title Throwing of the objectref on the subclass of Throwable
- */
- public void testN3() {
- T_opc_throw_8 t = new T_opc_throw_8();
- try {
- t.run();
- fail("must throw a Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @title Nearest matching catch must be executed in case of exception
- */
- public void testN4() {
- T_opc_throw_12 t = new T_opc_throw_12();
- assertTrue(t.run());
- }
-
- /**
- * @title NullPointerException If objectref is null, opc_throw throws
- * a NullPointerException instead of objectref
- */
- public void testE1() {
- T_opc_throw_4 t = new T_opc_throw_4();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- }
-
- /**
- * @title expected IllegalMonitorStateException
- */
- public void testE2() {
- T_opc_throw_5 t = new T_opc_throw_5();
- try {
- t.run();
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title (number of registers)
- */
- public void testVFE2() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- *
- * @constraint B1
- * @title type of argument - float
- */
- public void testVFE3() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE4() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B16
- * @title operand must be must be assignment-compatible
- * with java.lang.Throwable
-
- */
- public void testVFE5() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.d
deleted file mode 100644
index 90a4a03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_1.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- new-instance v1, java/lang/RuntimeException
- invoke-direct {v1}, java/lang/RuntimeException/<init>()V
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.java
deleted file mode 100644
index 6aa25db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_1 {
-
- public void run() {
- throw new RuntimeException();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.d
deleted file mode 100644
index c3194bb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_10.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
- new-instance v1, java/lang/String
- invoke-direct {v1}, java/lang/String/<init>()V
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.java
deleted file mode 100644
index b57a68c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_10 {
-
- public void run() {
- throw new RuntimeException();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d
deleted file mode 100644
index e096f4c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_12.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 2
-
-Label0:
- invoke-direct {v1}, dot/junit/opcodes/opc_throw/d/T_opc_throw_12/test()Z
- move-result v0
- return v0
-Label1:
- const v0, 0
- return v0
-
-.catch java/lang/RuntimeException from Label0 to Label1 using Label1
-.end method
-
-
-.method private test()Z
-.limit regs 2
-Label0:
- new-instance v0, java/lang/RuntimeException
- invoke-direct {v0}, java/lang/RuntimeException/<init>()V
- throw v0
-Label1:
- const v1, 1
- return v1
-
-.catch java/lang/RuntimeException from Label0 to Label1 using Label1
-.end method
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.java
deleted file mode 100644
index 50ef212..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_12 {
-
- public boolean run() {
-
- try{
- return test();
- } catch(RuntimeException e2) {
- }
- return false;
- }
-
- private boolean test() {
- try {
- throw new RuntimeException();
- } catch(RuntimeException e1) {
- return true;
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.d
deleted file mode 100644
index 95c3657..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_2.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- new-instance v1, java/lang/Throwable
- invoke-direct {v1}, java/lang/Throwable/<init>()V
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.java
deleted file mode 100644
index df4c62d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_2 {
-
- public void run() throws Throwable {
- throw new Throwable();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_3.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_3.d
deleted file mode 100644
index 7ef732a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_3.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- const-wide v1, 314
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.d
deleted file mode 100644
index ab5d803..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_4.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/4 v1, 0
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.java
deleted file mode 100644
index 89c576d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_4 {
-
- public void run() {
- throw new RuntimeException();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d
deleted file mode 100644
index 4e23269..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_5.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public declared_synchronized run()V
-.limit regs 6
-
- monitor-exit v5
-
- new-instance v1, java/lang/NullPointerException
- invoke-direct {v1}, java/lang/NullPointerException/<init>()V
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.java
deleted file mode 100644
index 748e08c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_5 {
-
- public synchronized void run() {
- throw new NullPointerException();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_6.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_6.d
deleted file mode 100644
index 51ca304..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_6.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- new-instance v1, java/lang/RuntimeException
- invoke-direct {v1}, java/lang/RuntimeException/<init>()V
- throw v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_7.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_7.d
deleted file mode 100644
index bf85401..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_7.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- const v1, 3.14
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.d b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.d
deleted file mode 100644
index 8b91411..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_opc_throw_8.java
-.class public dot.junit.opcodes.opc_throw.d.T_opc_throw_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- new-instance v1, java/lang/Error
- invoke-direct {v1}, java/lang/Error/<init>()V
- throw v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.java
deleted file mode 100644
index 30dc98a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_8 {
-
- public void run() throws Error {
- throw new Error();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_9.java b/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_9.java
deleted file mode 100644
index bd173cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.opc_throw.d;
-
-public class T_opc_throw_9 {
-
- public void run() {
- throw new RuntimeException();
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/Test_or_int.java b/tools/vm-tests/src/dot/junit/opcodes/or_int/Test_or_int.java
deleted file mode 100644
index e2ebcbf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/Test_or_int.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.or_int.d.T_or_int_1;
-import dot.junit.opcodes.or_int.d.T_or_int_6;
-
-public class Test_or_int extends DxTestCase {
-
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_or_int_1 t = new T_or_int_1();
- assertEquals(15, t.run(15, 8));
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfffffff1
- */
- public void testN2() {
- T_or_int_1 t = new T_or_int_1();
- assertEquals(0xfffffff9, t.run(0xfffffff8, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_or_int_1 t = new T_or_int_1();
- assertEquals(-1, t.run(0xcafe, -1));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_or_int_6 t = new T_or_int_6();
- try {
- t.run(3.14f, 15);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_or_int_1 t = new T_or_int_1();
- assertEquals(-1, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
- */
- public void testB2() {
- T_or_int_1 t = new T_or_int_1();
- assertEquals(0xffffffff, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_1.d
deleted file mode 100644
index bac2513..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_1.java
-.class public dot.junit.opcodes.or_int.d.T_or_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- or-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_1.java
deleted file mode 100644
index 36da158..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int.d;
-
-public class T_or_int_1 {
-
- public int run(int a, int b) {
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_2.d
deleted file mode 100644
index 9afca45..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2.java
-.class public dot.junit.opcodes.or_int.d.T_or_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- or-int v0, v6, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_3.d
deleted file mode 100644
index cc2a413..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_3.java
-.class public dot.junit.opcodes.or_int.d.T_or_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)I
-.limit regs 8
-
- or-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_4.d
deleted file mode 100644
index f47f082..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_4.java
-.class public dot.junit.opcodes.or_int.d.T_or_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)I
-.limit regs 8
-
- or-int v0, v5, v6
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_5.d
deleted file mode 100644
index 65aee2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_5.java
-.class public dot.junit.opcodes.or_int.d.T_or_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- or-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_6.d
deleted file mode 100644
index 5543c18..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_6.java
-.class public dot.junit.opcodes.or_int.d.T_or_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- or-int v0, v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_6.java b/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_6.java
deleted file mode 100644
index 9450467..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int/d/T_or_int_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int.d;
-
-public class T_or_int_6 {
-
- public int run(float a, int b) {
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java
deleted file mode 100644
index 1278e42..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_1;
-import dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_6;
-
-public class Test_or_int_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_or_int_2addr_1 t = new T_or_int_2addr_1();
- assertEquals(15, t.run(15, 8));
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfffffff1
- */
- public void testN2() {
- T_or_int_2addr_1 t = new T_or_int_2addr_1();
- assertEquals(0xfffffff9, t.run(0xfffffff8, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_or_int_2addr_1 t = new T_or_int_2addr_1();
- assertEquals(-1, t.run(0xcafe, -1));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_or_int_2addr_6 t = new T_or_int_2addr_6();
- try {
- t.run(3.14f, 15);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_or_int_2addr_1 t = new T_or_int_2addr_1();
- assertEquals(-1, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
- */
- public void testB2() {
- T_or_int_2addr_1 t = new T_or_int_2addr_1();
- assertEquals(0xffffffff, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.d
deleted file mode 100644
index c1d6357..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2addr_1.java
-.class public dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- or-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.java
deleted file mode 100644
index d802576..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_2addr.d;
-
-public class T_or_int_2addr_1 {
-
- public int run(int a, int b) {
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2.d
deleted file mode 100644
index 0fe271f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2addr_2.java
-.class public dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- or-int/2addr v6, v8
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3.d
deleted file mode 100644
index f7b8de4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2addr_3.java
-.class public dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)I
-.limit regs 8
-
- or-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4.d
deleted file mode 100644
index c29c45a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2addr_4.java
-.class public dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- or-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5.d
deleted file mode 100644
index 55c9544..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2addr_5.java
-.class public dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- or-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.d
deleted file mode 100644
index 2eb863f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_2addr_6.java
-.class public dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- or-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.java
deleted file mode 100644
index 271e8ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_2addr.d;
-
-public class T_or_int_2addr_6 {
-
- public int run(float a, int b) {
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java
deleted file mode 100644
index 0595a7f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_1;
-import dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_2;
-import dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_3;
-import dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_4;
-import dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_5;
-
-public class Test_or_int_lit16 extends DxTestCase {
-
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_or_int_lit16_1 t = new T_or_int_lit16_1();
- assertEquals(15, t.run(15));
- }
-
- /**
- * @title Arguments = 0x5ff5, 0x7ff7
- */
- public void testN2() {
- T_or_int_lit16_2 t = new T_or_int_lit16_2();
- assertEquals(0x7ff7, t.run(0x5ff5));
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_or_int_lit16_3 t = new T_or_int_lit16_3();
- assertEquals(-1, t.run(0xcaf));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_or_int_lit16_4 t = new T_or_int_lit16_4();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_or_int_lit16_3 t = new T_or_int_lit16_3();
- assertEquals(-1, t.run(0));
- }
-
- /**
- * @title Arguments = Short.MAX_VALUE & Short.MIN_VALUE
- */
- public void testB2() {
- T_or_int_lit16_5 t = new T_or_int_lit16_5();
- assertEquals(0xffffffff, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.d
deleted file mode 100644
index 2750eb2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_1.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit16 v0, v7, 8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.java
deleted file mode 100644
index b9c94bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_1 {
-
- public int run(int a) {
- int b = 8;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.d
deleted file mode 100644
index bbddaa9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_2.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit16 v0, v7, 0x7ff7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.java
deleted file mode 100644
index b87fd5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_2 {
-
- public int run(int a) {
- int b = 0x7ff7;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.d
deleted file mode 100644
index ee50f62..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_3.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit16 v0, v7, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.java
deleted file mode 100644
index bddbf13..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_3 {
-
- public int run(int a) {
- int b = -1;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.d
deleted file mode 100644
index 2bc0910..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_4.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 8
-
- or-int/lit16 v0, v7, 15
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.java
deleted file mode 100644
index fe01a61..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_4 {
-
- public int run(float a) {
- int b = 15;
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.d
deleted file mode 100644
index a227848..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_5.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit16 v0, v7, 32767
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.java
deleted file mode 100644
index f94b3aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_5 {
-
- public int run(int b) {
- int a = Short.MAX_VALUE;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.d
deleted file mode 100644
index 539491a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_6.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit16 v0, v8, 8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.java
deleted file mode 100644
index 78c7732..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_6 {
-
- public int run(int a) {
- int b = 8;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.d
deleted file mode 100644
index 1e28c75..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_7.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- or-int/lit16 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.java
deleted file mode 100644
index 784592a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_7 {
-
- public int run(double a) {
- int b = 10;
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.d
deleted file mode 100644
index 42150a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_8.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- or-int/lit16 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.java
deleted file mode 100644
index 0f65388..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_8 {
-
- public int run(long a) {
- int b = 10;
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.d
deleted file mode 100644
index a810f2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit16_9.java
-.class public dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit16 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.java
deleted file mode 100644
index 96c28ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit16.d;
-
-public class T_or_int_lit16_9 {
-
- public int run(int a) {
- int b = 10;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java
deleted file mode 100644
index a9b697c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_1;
-import dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_2;
-import dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_3;
-import dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_4;
-import dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_5;
-
-public class Test_or_int_lit8 extends DxTestCase {
-
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_or_int_lit8_1 t = new T_or_int_lit8_1();
- assertEquals(15, t.run(15));
- }
-
- /**
- * @title Arguments = 0x5f, 0x7f
- */
- public void testN2() {
- T_or_int_lit8_2 t = new T_or_int_lit8_2();
- assertEquals(0x7f, t.run(0x5f));
- }
-
- /**
- * @title Arguments = 0xcafe & -1
- */
- public void testN3() {
- T_or_int_lit8_3 t = new T_or_int_lit8_3();
- assertEquals(-1, t.run(0xcaf));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_or_int_lit8_4 t = new T_or_int_lit8_4();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_or_int_lit8_3 t = new T_or_int_lit8_3();
- assertEquals(-1, t.run(0));
- }
-
- /**
- * @title Arguments = Short.MAX_VALUE & Short.MIN_VALUE
- */
- public void testB2() {
- T_or_int_lit8_5 t = new T_or_int_lit8_5();
- assertEquals(0xffffffff, t.run(Byte.MIN_VALUE));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.d
deleted file mode 100644
index 71967f6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_1.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit8 v0, v7, 8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.java
deleted file mode 100644
index eaedd28..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_1 {
-
- public int run(int a) {
- int b = 8;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.d
deleted file mode 100644
index 44143ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_2.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit8 v0, v7, 0x7f
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.java
deleted file mode 100644
index 3a93f0e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_2 {
-
- public int run(int a) {
- int b = 0x7f;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.d
deleted file mode 100644
index 9039138..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_3.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit8 v0, v7, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.java
deleted file mode 100644
index 0c93d21..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_3 {
-
- public int run(int a) {
- int b = -1;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.d
deleted file mode 100644
index 6e07519..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_4.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 8
-
- or-int/lit8 v0, v7, 15
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.java
deleted file mode 100644
index 83c991b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_4 {
-
- public int run(float a) {
- int b = 15;
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.d
deleted file mode 100644
index c765b57..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_5.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit8 v0, v7, 127
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.java
deleted file mode 100644
index 8cc8560..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_5 {
-
- public int run(int a) {
- int b = Byte.MAX_VALUE;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.d
deleted file mode 100644
index 3a70209..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_6.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit8 v0, v8, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.java
deleted file mode 100644
index 5f9478b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_6 {
-
- public int run(int a) {
- int b = 10;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.d
deleted file mode 100644
index 8040a0e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_7.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- or-int/lit8 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.java
deleted file mode 100644
index 578692d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_7 {
-
- public int run(double a) {
- int b = 10;
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.d
deleted file mode 100644
index e0b4801..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_8.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- or-int/lit8 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.java
deleted file mode 100644
index a00cb27..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_8 {
-
- public int run(long a) {
- int b = 10;
- return (int)a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.d
deleted file mode 100644
index 7e44fec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_int_lit8_9.java
-.class public dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- or-int/lit8 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.java
deleted file mode 100644
index 1a67d00..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_int_lit8.d;
-
-public class T_or_int_lit8_9 {
-
- public int run(int a) {
- int b = 10;
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/Test_or_long.java b/tools/vm-tests/src/dot/junit/opcodes/or_long/Test_or_long.java
deleted file mode 100644
index 87c351e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/Test_or_long.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.or_long.d.T_or_long_1;
-import dot.junit.opcodes.or_long.d.T_or_long_3;
-
-public class Test_or_long extends DxTestCase {
-
- /**
- * @title Arguments = 123456789121l, 2l
- */
- public void testN1() {
- T_or_long_1 t = new T_or_long_1();
- assertEquals(123456789123l, t.run(123456789121l, 2l));
- }
-
- /**
- * @title Arguments = 0xffffffffffffff8l, 0xffffffffffffff1l
- */
- public void testN2() {
- T_or_long_1 t = new T_or_long_1();
- assertEquals(0xffffffffffffff9l, t.run(0xffffffffffffff8l,
- 0xffffffffffffff1l));
- }
-
- /**
- * @title Arguments = 0xabcdefabcdef & -1
- */
- public void testN3() {
- T_or_long_1 t = new T_or_long_1();
- assertEquals(-1l, t.run(0xabcdefabcdefl, -1l));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_or_long_3 t = new T_or_long_3();
- try {
- t.run(500000l, 1.05d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_or_long_1 t = new T_or_long_1();
- assertEquals(-1l, t.run(0l, -1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MIN_VALUE
- */
- public void testB2() {
- T_or_long_1 t = new T_or_long_1();
- assertEquals(-1l, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int & long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float & long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_1.d
deleted file mode 100644
index 6bc5ef8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_1.java
-.class public dot.junit.opcodes.or_long.d.T_or_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- or-long v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_1.java
deleted file mode 100644
index 0e565cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_long.d;
-
-public class T_or_long_1 {
-
- public long run(long a, long b) {
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_2.d
deleted file mode 100644
index b33694e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2.java
-.class public dot.junit.opcodes.or_long.d.T_or_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- or-long v0, v10, v14
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_3.d
deleted file mode 100644
index f85ee63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_3.java
-.class public dot.junit.opcodes.or_long.d.T_or_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- or-long v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_3.java b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_3.java
deleted file mode 100644
index 2a86c48..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_long.d;
-
-public class T_or_long_3 {
-
- public long run(long a, double b) {
- return a | (long)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_4.d
deleted file mode 100644
index 89337b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_4.java
-.class public dot.junit.opcodes.or_long.d.T_or_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)J
-.limit regs 14
-
- or-long v0, v11, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_5.d
deleted file mode 100644
index 91fbc4d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_5.java
-.class public dot.junit.opcodes.or_long.d.T_or_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FJ)J
-.limit regs 14
-
- or-long v0, v11, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_6.d
deleted file mode 100644
index ee5c07a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long/d/T_or_long_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_6.java
-.class public dot.junit.opcodes.or_long.d.T_or_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- or-long v0, v9, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java
deleted file mode 100644
index 16e34b0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_1;
-import dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_3;
-
-public class Test_or_long_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 123456789121l, 2l
- */
- public void testN1() {
- T_or_long_2addr_1 t = new T_or_long_2addr_1();
- assertEquals(123456789123l, t.run(123456789121l, 2l));
- }
-
- /**
- * @title Arguments = 0xffffffffffffff8l, 0xffffffffffffff1l
- */
- public void testN2() {
- T_or_long_2addr_1 t = new T_or_long_2addr_1();
- assertEquals(0xffffffffffffff9l, t.run(0xffffffffffffff8l,
- 0xffffffffffffff1l));
- }
-
- /**
- * @title Arguments = 0xabcdefabcdef & -1
- */
- public void testN3() {
- T_or_long_2addr_1 t = new T_or_long_2addr_1();
- assertEquals(-1l, t.run(0xabcdefabcdefl, -1l));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_or_long_2addr_3 t = new T_or_long_2addr_3();
- try {
- t.run(500000l, 1.05d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_or_long_2addr_1 t = new T_or_long_2addr_1();
- assertEquals(-1l, t.run(0l, -1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MIN_VALUE
- */
- public void testB2() {
- T_or_long_2addr_1 t = new T_or_long_2addr_1();
- assertEquals(-1l, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int & long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float & long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.d
deleted file mode 100644
index a7c4859..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2addr_1.java
-.class public dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- or-long/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.java
deleted file mode 100644
index c82fc8a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_long_2addr.d;
-
-public class T_or_long_2addr_1 {
-
- public long run(long a, long b) {
- return a | b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2.d
deleted file mode 100644
index f7db657..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2addr_2.java
-.class public dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- or-long/2addr v10, v14
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.d
deleted file mode 100644
index 5604162..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2addr_3.java
-.class public dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- or-long/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.java b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.java
deleted file mode 100644
index 98c77b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.or_long_2addr.d;
-
-public class T_or_long_2addr_3 {
-
- public long run(long a, double b) {
- return a | (long)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4.d
deleted file mode 100644
index a13b59f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2addr_4.java
-.class public dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)J
-.limit regs 14
-
- or-long/2addr v11, v12
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5.d
deleted file mode 100644
index 7d7667d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2addr_5.java
-.class public dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FJ)J
-.limit regs 14
-
- or-long/2addr v11, v12
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6.d
deleted file mode 100644
index 65d1c7b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_or_long_2addr_6.java
-.class public dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- or-long/2addr v9, v12
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java
deleted file mode 100644
index 780a490..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.packed_switch;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.packed_switch.d.T_packed_switch_1;
-import dot.junit.opcodes.packed_switch.d.T_packed_switch_2;
-
-public class Test_packed_switch extends DxTestCase {
-
- /**
- * @title try different values
- */
- public void testN1() {
- T_packed_switch_1 t = new T_packed_switch_1();
- assertEquals(2, t.run(-1));
-
- assertEquals(-1, t.run(4));
- assertEquals(20, t.run(2));
- assertEquals(-1, t.run(5));
-
- assertEquals(-1, t.run(6));
- assertEquals(20, t.run(3));
- assertEquals(-1, t.run(7));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN2() {
- try {
- T_packed_switch_2 t = new T_packed_switch_2();
- t.run(-1.23f);
- } catch(Throwable t) {
-
- }
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB1() {
- T_packed_switch_1 t = new T_packed_switch_1();
- assertEquals(-1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB2() {
- T_packed_switch_1 t = new T_packed_switch_1();
- assertEquals(-1, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_packed_switch_1 t = new T_packed_switch_1();
- assertEquals(-1, t.run(0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A7
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A7
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint A7
- * @title offset to table shall be inside method
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A7
- * @title the size and the list of targets must be consistent.
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B22
- * @title packed-switch-data pseudo-instructions must not be reachable by control flow
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A7
- * @title table has wrong ident code
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_1.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_1.d
deleted file mode 100644
index bd692e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_1.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_1.java b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_1.java
deleted file mode 100644
index 4c56e14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.packed_switch.d;
-
-public class T_packed_switch_1 {
-
- public int run(int i) {
- switch (i) {
- case -1:
- return 2;
- case 2:
- case 3:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.d
deleted file mode 100644
index d1d2d03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_11.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.dfh
deleted file mode 100644
index 451465e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.dfh
+++ /dev/null
@@ -1,272 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 7b3e5055
- 55 50 3E 7B
-// parsed: offset 12, len 20: signature : 13de...bd04
- 13 DE 7D 13 9F C2 C8 77 AF 7A EA 9B 47 76 9C 01 E5 F3 BD 04
-// parsed: offset 32, len 4: file_size : 608
- 60 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 472 (0x0001d8)
- D8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 368
- 70 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 334 (0x00014e) "<init>"
- 4E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 342 (0x000156) "I"
- 56 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "II"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 349 (0x00015d) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_11;"
- 5D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 405 (0x000195) "Ljava/lang/Object;"
- 95 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 425 (0x0001a9) "T_packed_switch_11.java"
- A9 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 450 (0x0001c2) "V"
- C2 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 453 (0x0001c5) "run"
- C5 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_11;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 02 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_packed_switch_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 458 (0x0001ca)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 CA 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_11.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_11.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 24
- 18 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: packed-switch v4, 0000000a // +0x0000000a
- 2B 04 0A 00 00 00
- // parsed: offset 286, len 2: |0003: const/4 v2, #int -1 // #0xff
- 12 F2
- // parsed: offset 288, len 2: |0004: return v2
- 0F 02
- // parsed: offset 290, len 2: |0005: const/4 v2, #int 2 // #0x2
- 12 22
- // parsed: offset 292, len 2: |0006: return v2
- 0F 02
- // parsed: offset 294, len 4: |0007: const/16 v2, #int 20 // #0x14
- 13 02 14 00
- // parsed: offset 298, len 2: |0009: return v2
- 0F 02
- // parsed: offset 300, len 28: |000a: packed-switch-data (14 units)
-//@mod 00 01 05 00 FF FF FF FF 05 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 00 00 00
- 00 01 06 00 FF FF FF FF 05 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 1
- 01 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 334, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 342, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 345, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 349, len 56: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_11;"
- 36 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 2F 64 2F 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 31 31 3B 00
-// parsed: offset 405, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 425, len 25: TYPE_STRING_DATA_ITEM [5] "T_packed_switch_11.java"
- 17 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 450, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 453, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_11;"
- // parsed: offset 458, len 1: static_fields_size: 0
- 00
- // parsed: offset 459, len 1: instance_fields_size: 0
- 00
- // parsed: offset 460, len 1: direct_methods_size: 1
- 01
- // parsed: offset 461, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 462, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 463, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 466, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 468, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 469, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 470, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 472, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 476, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 488, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 500, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 512, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 524, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 536, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 548, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 560, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 328 (0x000148)
- 01 10 00 00 01 00 00 00 48 01 00 00
- // parsed: offset 572, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 334 (0x00014e)
- 02 20 00 00 08 00 00 00 4E 01 00 00
- // parsed: offset 584, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 458 (0x0001ca)
- 00 20 00 00 01 00 00 00 CA 01 00 00
- // parsed: offset 596, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 472 (0x0001d8)
- 00 10 00 00 01 00 00 00 D8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.java b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.java
deleted file mode 100644
index 3565f3a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_11.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.packed_switch.d;
-
-public class T_packed_switch_11 {
-
- public int run(int i) {
- switch (i) {
- case 1:
- return 2;
- }
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_12.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_12.d
deleted file mode 100644
index 58afb0b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_12.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_12.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto Label0
-
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-Label0:
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.d
deleted file mode 100644
index 2e7471b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_13.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- goto Label0
-Label0:
- packed-switch v4, 0
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.dfh b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.dfh
deleted file mode 100644
index 4bfcca7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_13.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 87464e10
- 10 4E 46 87
-// parsed: offset 12, len 20: signature : 7bca...1bb2
- 7B CA CF 83 19 C2 CE 39 ED B4 6A 93 F6 BF AF D5 3E F6 1B B2
-// parsed: offset 32, len 4: file_size : 608
- 60 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 472 (0x0001d8)
- D8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 368
- 70 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 334 (0x00014e) "<init>"
- 4E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 342 (0x000156) "I"
- 56 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "II"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 349 (0x00015d) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_13;"
- 5D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 405 (0x000195) "Ljava/lang/Object;"
- 95 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 425 (0x0001a9) "T_packed_switch_13.java"
- A9 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 450 (0x0001c2) "V"
- C2 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 453 (0x0001c5) "run"
- C5 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_13;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 02 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_13;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_packed_switch_13.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 458 (0x0001ca)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 CA 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_13.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_13.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 24
- 18 00 00 00
- // insns:
- // parsed: offset 280, len 2: |0000: goto 0001 // +0x0001
- 28 01
- // parsed: offset 282, len 6: |0001: packed-switch v4, 0000000c // +0x0000000b
- 2B 04 0B 00 00 00
- // parsed: offset 288, len 2: |0004: const/4 v2, #int -1 // #0xff
- 12 F2
- // parsed: offset 290, len 2: |0005: return v2
- 0F 02
- // parsed: offset 292, len 2: |0006: const/4 v2, #int 2 // #0x2
- 12 22
- // parsed: offset 294, len 2: |0007: return v2
- 0F 02
- // parsed: offset 296, len 4: |0008: const/16 v2, #int 20 // #0x14
- 13 02 14 00
- // parsed: offset 300, len 2: |000a: return v2
- 0F 02
- // parsed: offset 302, len 2: |000b: nop // spacer
- 00 00
- // parsed: offset 304, len 24: |000c: packed-switch-data (12 units)
-//@mod 00 01 04 00 00 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 00 00 00
- 00 06 04 00 00 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 1
- 01 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 334, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 342, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 345, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 349, len 56: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_13;"
- 36 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 2F 64 2F 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 31 33 3B 00
-// parsed: offset 405, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 425, len 25: TYPE_STRING_DATA_ITEM [5] "T_packed_switch_13.java"
- 17 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 31 33 2E 6A 61 76 61 00
-// parsed: offset 450, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 453, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_13;"
- // parsed: offset 458, len 1: static_fields_size: 0
- 00
- // parsed: offset 459, len 1: instance_fields_size: 0
- 00
- // parsed: offset 460, len 1: direct_methods_size: 1
- 01
- // parsed: offset 461, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 462, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 463, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 466, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 468, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 469, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 470, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 472, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 476, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 488, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 500, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 512, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 524, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 536, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 548, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 560, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 328 (0x000148)
- 01 10 00 00 01 00 00 00 48 01 00 00
- // parsed: offset 572, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 334 (0x00014e)
- 02 20 00 00 08 00 00 00 4E 01 00 00
- // parsed: offset 584, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 458 (0x0001ca)
- 00 20 00 00 01 00 00 00 CA 01 00 00
- // parsed: offset 596, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 472 (0x0001d8)
- 00 10 00 00 01 00 00 00 D8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_2.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_2.d
deleted file mode 100644
index a356eb3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_2.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_2.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_2.java b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_2.java
deleted file mode 100644
index 977aea7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.packed_switch.d;
-
-public class T_packed_switch_2 {
-
- public int run(float i) {
- switch ((int)i) {
- case -1:
- return 2;
- case 2:
- case 3:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_3.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_3.d
deleted file mode 100644
index 79e9e8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_3.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_3.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v5, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_4.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_4.d
deleted file mode 100644
index 1c3d42b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_4.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_4.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 5
- packed-switch v3, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_5.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_5.d
deleted file mode 100644
index c648fbb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_5.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_5.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 5
- packed-switch v3, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_6.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_6.d
deleted file mode 100644
index 9a18602..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_6.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_6.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v3, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.d
deleted file mode 100644
index ebf9766..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_7.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.dfh b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.dfh
deleted file mode 100644
index d30068e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : efe7503a
- 3A 50 E7 EF
-// parsed: offset 12, len 20: signature : eeec...6db9
- EE EC 3C 7A 99 EE 9C AE 73 67 A0 02 4A 34 19 B6 D1 E8 6D B9
-// parsed: offset 32, len 4: file_size : 608
- 60 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 472 (0x0001d8)
- D8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 368
- 70 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 334 (0x00014e) "<init>"
- 4E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 342 (0x000156) "I"
- 56 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "II"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 349 (0x00015d) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_7;"
- 5D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 404 (0x000194) "Ljava/lang/Object;"
- 94 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 424 (0x0001a8) "T_packed_switch_7.java"
- A8 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 448 (0x0001c0) "V"
- C0 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 451 (0x0001c3) "run"
- C3 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_7;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 02 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_7;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_packed_switch_7.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 456 (0x0001c8)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 C8 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_7.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_7.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 24
- 18 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: packed-switch v4, 0000000a // +0x0000000a
- 2B 04 0A 00 00 00
- // parsed: offset 286, len 2: |0003: const/4 v2, #int -1 // #0xff
- 12 F2
- // parsed: offset 288, len 2: |0004: return v2
- 0F 02
- // parsed: offset 290, len 2: |0005: const/4 v2, #int 2 // #0x2
- 12 22
- // parsed: offset 292, len 2: |0006: return v2
- 0F 02
- // parsed: offset 294, len 4: |0007: const/16 v2, #int 20 // #0x14
- 13 02 14 00
- // parsed: offset 298, len 2: |0009: return v2
- 0F 02
- // parsed: offset 300, len 28: |000a: packed-switch-data (14 units)
-//@mod 00 01 05 00 FF FF FF FF 05 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 00 00 00
- 00 01 05 00 FF FF FF FF 05 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 01 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 1
- 01 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 334, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 342, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 345, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 349, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_7;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 2F 64 2F 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 37 3B 00
-// parsed: offset 404, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 424, len 24: TYPE_STRING_DATA_ITEM [5] "T_packed_switch_7.java"
- 16 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 37 2E 6A 61 76 61 00
-// parsed: offset 448, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 451, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_7;"
- // parsed: offset 456, len 1: static_fields_size: 0
- 00
- // parsed: offset 457, len 1: instance_fields_size: 0
- 00
- // parsed: offset 458, len 1: direct_methods_size: 1
- 01
- // parsed: offset 459, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 460, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 461, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 464, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 466, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 467, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 468, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 470, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 472, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 476, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 488, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 500, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 512, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 524, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 536, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 548, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 560, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 328 (0x000148)
- 01 10 00 00 01 00 00 00 48 01 00 00
- // parsed: offset 572, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 334 (0x00014e)
- 02 20 00 00 08 00 00 00 4E 01 00 00
- // parsed: offset 584, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 456 (0x0001c8)
- 00 20 00 00 01 00 00 00 C8 01 00 00
- // parsed: offset 596, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 472 (0x0001d8)
- 00 10 00 00 01 00 00 00 D8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.java b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.java
deleted file mode 100644
index 53e1806..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_7.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.packed_switch.d;
-
-public class T_packed_switch_7 {
-
- public int run(int i) {
- switch (i) {
- case 1:
- return 2;
- case 2:
- case 3:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.d
deleted file mode 100644
index b22771c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_8.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const v2, -1
- return v2
-Label9:
- const v2, 2
- return v2
-Label12:
- const v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.dfh
deleted file mode 100644
index 71189f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 7f5c534c
- 4C 53 5C 7F
-// parsed: offset 12, len 20: signature : 97ca...2c6d
- 97 CA 8C F6 19 E5 9D 0D D2 A3 C8 ED 06 77 15 0E AE A8 2C 6D
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_8;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 416 (0x0001a0) "Ljava/lang/Object;"
- A0 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 436 (0x0001b4) "T_packed_switch_8.java"
- B4 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 460 (0x0001cc) "V"
- CC 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 463 (0x0001cf) "run"
- CF 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_8;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_packed_switch_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 468 (0x0001d4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_8.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_8.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: packed-switch v4, 00000010 // +0x00000010
- 2B 04 10 00 00 00
- // parsed: offset 286, len 6: |0003: const v2, #float nan // #0xffffffff int
- 14 02 FF FF FF FF
- // parsed: offset 292, len 2: |0006: return v2
- 0F 02
- // parsed: offset 294, len 6: |0007: const v2, #float 0.000000 // #0x00000002 int
- 14 02 02 00 00 00
- // parsed: offset 300, len 2: |000a: return v2
- 0F 02
- // parsed: offset 302, len 6: |000b: const v2, #float 0.000000 // #0x00000014 int
- 14 02 14 00 00 00
- // parsed: offset 308, len 2: |000e: return v2
- 0F 02
- // parsed: offset 310, len 2: |000f: nop // spacer
- 00 00
- // parsed: offset 312, len 28: |0010: packed-switch-data (14 units)
-//@mod 00 01 05 00 FF FF FF FF 07 00 00 00 03 00 00 00 03 00 00 00 0B 00 00 00 0B 00 00 00
- 00 01 05 00 FF FF FF FF 07 00 00 00 03 00 00 00 03 00 00 00 0B 00 00 00 0C 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_8;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 2F 64 2F 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 38 3B 00
-// parsed: offset 416, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 436, len 24: TYPE_STRING_DATA_ITEM [5] "T_packed_switch_8.java"
- 16 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 38 2E 6A 61 76 61 00
-// parsed: offset 460, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 463, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_8;"
- // parsed: offset 468, len 1: static_fields_size: 0
- 00
- // parsed: offset 469, len 1: instance_fields_size: 0
- 00
- // parsed: offset 470, len 1: direct_methods_size: 1
- 01
- // parsed: offset 471, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 472, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 473, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 476, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 478, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 479, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 480, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 482, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 20 00 00 01 00 00 00 D4 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.d b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.d
deleted file mode 100644
index 217a917..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_packed_switch_9.java
-.class public dot.junit.opcodes.packed_switch.d.T_packed_switch_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
- packed-switch v4, -1
- Label9 ; -1
- Label6 ; 0
- Label6 ; 1
- Label12 ; 2
- Label12 ; 3
- packed-switch-end
-Label6:
- const/4 v2, -1
- return v2
-Label9:
- const/4 v2, 2
- return v2
-Label12:
- const/16 v2, 20
- return v2
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.dfh
deleted file mode 100644
index f499745..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/packed_switch/d/T_packed_switch_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 8b9450f3
- F3 50 94 8B
-// parsed: offset 12, len 20: signature : 70d9...f3d5
- 70 D9 7D E3 97 15 3F D2 B8 B5 72 A3 F9 DE 77 29 3D 5A F3 D5
-// parsed: offset 32, len 4: file_size : 608
- 60 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 472 (0x0001d8)
- D8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 368
- 70 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 334 (0x00014e) "<init>"
- 4E 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 342 (0x000156) "I"
- 56 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "II"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 349 (0x00015d) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_9;"
- 5D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 404 (0x000194) "Ljava/lang/Object;"
- 94 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 424 (0x0001a8) "T_packed_switch_9.java"
- A8 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 448 (0x0001c0) "V"
- C0 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 451 (0x0001c3) "run"
- C3 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_9;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 328 (0x000148)
- 02 00 00 00 00 00 00 00 48 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_packed_switch_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 456 (0x0001c8)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 C8 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_9.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.packed_switch.d.T_packed_switch_9.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 24
- 18 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: packed-switch v4, 0000000a // +0x0000000a
-//@mod 2B 04 0A 00 00 00
- 2B 04 0A 01 00 00
- // parsed: offset 286, len 2: |0003: const/4 v2, #int -1 // #0xff
- 12 F2
- // parsed: offset 288, len 2: |0004: return v2
- 0F 02
- // parsed: offset 290, len 2: |0005: const/4 v2, #int 2 // #0x2
- 12 22
- // parsed: offset 292, len 2: |0006: return v2
- 0F 02
- // parsed: offset 294, len 4: |0007: const/16 v2, #int 20 // #0x14
- 13 02 14 00
- // parsed: offset 298, len 2: |0009: return v2
- 0F 02
- // parsed: offset 300, len 28: |000a: packed-switch-data (14 units)
- 00 01 05 00 FF FF FF FF 05 00 00 00 03 00 00 00 03 00 00 00 07 00 00 00 07 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 328, len 4: size: 1
- 01 00 00 00
- // parsed: offset 332, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 334, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 342, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 345, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 349, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_9;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 2F 64 2F 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 39 3B 00
-// parsed: offset 404, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 424, len 24: TYPE_STRING_DATA_ITEM [5] "T_packed_switch_9.java"
- 16 54 5F 70 61 63 6B 65 64 5F 73 77 69 74 63 68 5F 39 2E 6A 61 76 61 00
-// parsed: offset 448, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 451, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/packed_switch/d/T_packed_switch_9;"
- // parsed: offset 456, len 1: static_fields_size: 0
- 00
- // parsed: offset 457, len 1: instance_fields_size: 0
- 00
- // parsed: offset 458, len 1: direct_methods_size: 1
- 01
- // parsed: offset 459, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 460, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 461, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 464, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 466, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 467, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 468, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 470, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 472, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 476, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 488, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 500, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 512, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 524, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 536, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 548, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 560, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 328 (0x000148)
- 01 10 00 00 01 00 00 00 48 01 00 00
- // parsed: offset 572, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 334 (0x00014e)
- 02 20 00 00 08 00 00 00 4E 01 00 00
- // parsed: offset 584, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 456 (0x0001c8)
- 00 20 00 00 01 00 00 00 C8 01 00 00
- // parsed: offset 596, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 472 (0x0001d8)
- 00 10 00 00 01 00 00 00 D8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/Test_rem_double.java b/tools/vm-tests/src/dot/junit/opcodes/rem_double/Test_rem_double.java
deleted file mode 100644
index bd540d8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/Test_rem_double.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_double.d.T_rem_double_1;
-import dot.junit.opcodes.rem_double.d.T_rem_double_4;
-
-public class Test_rem_double extends DxTestCase {
-
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(2.7d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(0d, t.run(0, 3.14d));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(-0.43999999999999995d, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_rem_double_4 t = new T_rem_double_4();
- try {
- t.run(500000l, 1.05d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB3() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY, -2.7d));
- }
-
- /**
- * @title Arguments = -2.7d, Double.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(-2.7d, t.run(-2.7d, Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(Double.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(0d, t.run(0, -2.7d));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(Double.NaN, t.run(-2.7d, 0));
- }
-
- /**
- * @title Arguments = 1, Double.MAX_VALUE
- */
- public void testB8() {
- T_rem_double_1 t = new T_rem_double_1();
- assertEquals(0d, t.run(1, Double.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, -1E-9d
- */
- public void testB9() {
- T_rem_double_1 t = new T_rem_double_1();
-
- assertEquals(1.543905285031139E-10d, t.run(Double.MAX_VALUE, -1E-9d));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.d
deleted file mode 100644
index 2585be4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_double_1.java
-.class public dot.junit.opcodes.rem_double.d.T_rem_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- rem-double v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.java
deleted file mode 100644
index 11f42f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_double.d;
-
-public class T_rem_double_1 {
-
- public double run(double a, double b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_2.d
deleted file mode 100644
index bacfdfd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_double_2.java
-.class public dot.junit.opcodes.rem_double.d.T_rem_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- rem-double v0, v12, v14
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_3.d
deleted file mode 100644
index 87ce2da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_double_3.java
-.class public dot.junit.opcodes.rem_double.d.T_rem_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)D
-.limit regs 14
-
- rem-double v0, v11, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.d
deleted file mode 100644
index b917916..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_double_4.java
-.class public dot.junit.opcodes.rem_double.d.T_rem_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)D
-.limit regs 14
-
- rem-double v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.java b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.java
deleted file mode 100644
index 52b842d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_double.d;
-
-public class T_rem_double_4 {
-
- public double run(long a, double b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_5.d
deleted file mode 100644
index 6a2a11a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_5.java
-.class public dot.junit.opcodes.rem_double.d.T_rem_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- rem-double v0, v9, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_6.d
deleted file mode 100644
index 5cb0397..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double/d/T_rem_double_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_double_6.java
-.class public dot.junit.opcodes.rem_double.d.T_rem_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)D
-.limit regs 14
-
- rem-double v0, v11, v13
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java
deleted file mode 100644
index da7b741..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_double_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_1;
-import dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_4;
-
-public class Test_rem_double_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(2.7d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(0d, t.run(0, 3.14d));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(-0.43999999999999995d, t.run(-3.14d, 2.7d));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_rem_double_2addr_4 t = new T_rem_double_2addr_4();
- try {
- t.run(500000l, 1.05d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB3() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY, -2.7d));
- }
-
- /**
- * @title Arguments = -2.7d, Double.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(-2.7d, t.run(-2.7d, Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(Double.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(0d, t.run(0, -2.7d));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(Double.NaN, t.run(-2.7d, 0));
- }
-
- /**
- * @title Arguments = 1, Double.MAX_VALUE
- */
- public void testB8() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
- assertEquals(0d, t.run(1, Double.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, -1E-9d
- */
- public void testB9() {
- T_rem_double_2addr_1 t = new T_rem_double_2addr_1();
-
- assertEquals(1.543905285031139E-10d, t.run(Double.MAX_VALUE, -1E-9d));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.d
deleted file mode 100644
index 898b7db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_2addr_1.java
-.class public dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- rem-double/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.java
deleted file mode 100644
index bf60eb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_double_2addr.d;
-
-public class T_rem_double_2addr_1 {
-
- public double run(double a, double b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2.d
deleted file mode 100644
index 923864f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_2addr_2.java
-.class public dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- rem-double/2addr v12, v14
- return-wide v12
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3.d
deleted file mode 100644
index 5913c80..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_2addr_3.java
-.class public dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)D
-.limit regs 14
-
- rem-double/2addr v11, v12
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.d
deleted file mode 100644
index a146daf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_2addr_4.java
-.class public dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)D
-.limit regs 14
-
- rem-double/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.java b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.java
deleted file mode 100644
index 964d640..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_double_2addr.d;
-
-public class T_rem_double_2addr_4 {
-
- public double run(long a, double b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5.d
deleted file mode 100644
index 92c22bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_2addr_5.java
-.class public dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 14
-
- rem-double/2addr v9, v12
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6.d
deleted file mode 100644
index 7ea6104..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_rem_double_2addr_6.java
-.class public dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)D
-.limit regs 14
-
- rem-double/2addr v11, v13
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/Test_rem_float.java b/tools/vm-tests/src/dot/junit/opcodes/rem_float/Test_rem_float.java
deleted file mode 100644
index 2955a04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/Test_rem_float.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_float.d.T_rem_float_1;
-import dot.junit.opcodes.rem_float.d.T_rem_float_6;
-
-public class Test_rem_float extends DxTestCase {
-
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(2.7f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(0f, t.run(0, 3.14f));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(-0.44000006f, t.run(-3.14f, 2.7f));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_rem_float_6 t = new T_rem_float_6();
- try {
- t.run(3.14f, 15);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB3() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY, -2.7f));
- }
-
- /**
- * @title Arguments = -2.7f, Float.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(-2.7f, t.run(-2.7f, Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(Float.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(0f, t.run(0, -2.7f));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(Float.NaN, t.run(-2.7f, 0));
- }
-
- /**
- * @title Arguments = 1, Float.MAX_VALUE
- */
- public void testB8() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(0f, t.run(1, Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, -1E-9f
- */
- public void testB9() {
- T_rem_float_1 t = new T_rem_float_1();
- assertEquals(7.2584893E-10f, t.run(Float.MAX_VALUE, -1E-9f));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.d
deleted file mode 100644
index a4edaea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_1.java
-.class public dot.junit.opcodes.rem_float.d.T_rem_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- rem-float v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.java
deleted file mode 100644
index 0c5e640..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_float.d;
-
-public class T_rem_float_1 {
-
- public float run(float a, float b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_2.d
deleted file mode 100644
index 8ce3466..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2.java
-.class public dot.junit.opcodes.rem_float.d.T_rem_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- rem-float v0, v7, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_3.d
deleted file mode 100644
index e773a12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_3.java
-.class public dot.junit.opcodes.rem_float.d.T_rem_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)F
-.limit regs 8
-
- rem-float v0, v5, v6
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_4.d
deleted file mode 100644
index afde65c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_4.java
-.class public dot.junit.opcodes.rem_float.d.T_rem_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JF)F
-.limit regs 8
-
- rem-float v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_5.d
deleted file mode 100644
index 23740bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_5.java
-.class public dot.junit.opcodes.rem_float.d.T_rem_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- rem-float v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.d
deleted file mode 100644
index 83ac469..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_6.java
-.class public dot.junit.opcodes.rem_float.d.T_rem_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)F
-.limit regs 8
-
- rem-float v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.java b/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.java
deleted file mode 100644
index d2592a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_float.d;
-
-public class T_rem_float_6 {
-
- public float run(float a, int b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java
deleted file mode 100644
index d0d743a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_float_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_1;
-import dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_6;
-
-public class Test_rem_float_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(2.7f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN2() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(0f, t.run(0, 3.14f));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN3() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(-0.44000006f, t.run(-3.14f, 2.7f));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_rem_float_2addr_6 t = new T_rem_float_2addr_6();
- try {
- t.run(3.14f, 15);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB3() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY, -2.7f));
- }
-
- /**
- * @title Arguments = -2.7f, Float.NEGATIVE_INFINITY
- */
- public void testB4() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(-2.7f, t.run(-2.7f, Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(Float.NaN, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -2.7
- */
- public void testB6() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(0f, t.run(0, -2.7f));
- }
-
- /**
- * @title Arguments = -2.7, 0
- */
- public void testB7() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(Float.NaN, t.run(-2.7f, 0));
- }
-
- /**
- * @title Arguments = 1, Float.MAX_VALUE
- */
- public void testB8() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(0f, t.run(1, Float.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, -1E-9f
- */
- public void testB9() {
- T_rem_float_2addr_1 t = new T_rem_float_2addr_1();
- assertEquals(7.2584893E-10f, t.run(Float.MAX_VALUE, -1E-9f));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.d
deleted file mode 100644
index a5571e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2addr_1.java
-.class public dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- rem-float/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.java
deleted file mode 100644
index 521abb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_float_2addr.d;
-
-public class T_rem_float_2addr_1 {
-
- public float run(float a, float b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2.d
deleted file mode 100644
index aef48cb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2addr_2.java
-.class public dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- rem-float/2addr v6, v8
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3.d
deleted file mode 100644
index 294652e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2addr_3.java
-.class public dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FD)F
-.limit regs 8
-
- rem-float/2addr v5, v6
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4.d
deleted file mode 100644
index 4c5f1f5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2addr_4.java
-.class public dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JF)F
-.limit regs 8
-
- rem-float/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5.d
deleted file mode 100644
index 44c82c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2addr_5.java
-.class public dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 8
-
- rem-float/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.d
deleted file mode 100644
index 4957893..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_float_2addr_6.java
-.class public dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)F
-.limit regs 8
-
- rem-float/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.java
deleted file mode 100644
index 72d01ed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_float_2addr.d;
-
-public class T_rem_float_2addr_6 {
-
- public float run(float a, int b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/Test_rem_int.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int/Test_rem_int.java
deleted file mode 100644
index e355a30..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/Test_rem_int.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_int.d.T_rem_int_1;
-import dot.junit.opcodes.rem_int.d.T_rem_int_6;
-
-public class Test_rem_int extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(0, t.run(8, 4));
- }
-
- /**
- * @title Arguments = 1073741823, 4
- */
- public void testN2() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(3, t.run(1073741823, 4));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(0, t.run(0, 4));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(-1, t.run(-10, 3));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(1, t.run(1073741824, -3));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(-697, t.run(-17895697, -3000));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_rem_int_6 t = new T_rem_int_6();
- try {
- t.run(3.14f, 15);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, -1
- */
- public void testB1() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, -1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB2() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB3() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(0, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB4() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(-1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MAX_VALUE
- */
- public void testB5() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(1, t.run(1, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MIN_VALUE
- */
- public void testB6() {
- T_rem_int_1 t = new T_rem_int_1();
- assertEquals(1, t.run(1, Integer.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_rem_int_1 t = new T_rem_int_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.d
deleted file mode 100644
index 25a1ec5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_1.java
-.class public dot.junit.opcodes.rem_int.d.T_rem_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- rem-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.java
deleted file mode 100644
index a24b8a6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int.d;
-
-public class T_rem_int_1 {
-
- public int run(int a, int b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_2.d
deleted file mode 100644
index 1fa948b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2.java
-.class public dot.junit.opcodes.rem_int.d.T_rem_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- rem-int v0, v7, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_3.d
deleted file mode 100644
index 5db617b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_3.java
-.class public dot.junit.opcodes.rem_int.d.T_rem_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- rem-int v0, v5, v6
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_4.d
deleted file mode 100644
index 69aeb8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_4.java
-.class public dot.junit.opcodes.rem_int.d.T_rem_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- rem-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_5.d
deleted file mode 100644
index d3b2b76..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_5.java
-.class public dot.junit.opcodes.rem_int.d.T_rem_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- rem-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.d
deleted file mode 100644
index 032b8ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_6.java
-.class public dot.junit.opcodes.rem_int.d.T_rem_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- rem-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.java
deleted file mode 100644
index 074fd8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int.d;
-
-public class T_rem_int_6 {
-
- public int run(float a, int b) {
- return (int)a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java
deleted file mode 100644
index f45439b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_1;
-import dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_6;
-
-public class Test_rem_int_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(0, t.run(8, 4));
- }
-
- /**
- * @title Arguments = 1073741823, 4
- */
- public void testN2() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(3, t.run(1073741823, 4));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(0, t.run(0, 4));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(-1, t.run(-10, 3));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(1, t.run(1073741824, -3));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(-697, t.run(-17895697, -3000));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_rem_int_2addr_6 t = new T_rem_int_2addr_6();
- try {
- t.run(3.14f, 15);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, -1
- */
- public void testB1() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, -1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB2() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB3() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(0, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
- */
- public void testB4() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(-1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MAX_VALUE
- */
- public void testB5() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(1, t.run(1, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1, Integer.MIN_VALUE
- */
- public void testB6() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- assertEquals(1, t.run(1, Integer.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.d
deleted file mode 100644
index 25a7fca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2addr_1.java
-.class public dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- rem-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.java
deleted file mode 100644
index d19c535..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_2addr.d;
-
-public class T_rem_int_2addr_1 {
-
- public int run(int a, int b) {
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2.d
deleted file mode 100644
index 0dee98c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2addr_2.java
-.class public dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- rem-int/2addr v6, v8
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3.d
deleted file mode 100644
index b76a76a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2addr_3.java
-.class public dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(ID)I
-.limit regs 8
-
- rem-int/2addr v5, v6
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4.d
deleted file mode 100644
index e3828d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2addr_4.java
-.class public dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- rem-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5.d
deleted file mode 100644
index d684c92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2addr_5.java
-.class public dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- rem-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.d
deleted file mode 100644
index 0e5825c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_2addr_6.java
-.class public dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)I
-.limit regs 8
-
- rem-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.java
deleted file mode 100644
index 9508f97..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_2addr.d;
-
-public class T_rem_int_2addr_6 {
-
- public int run(float a, int b) {
- return (int)a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java
deleted file mode 100644
index 3449f86..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_1;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_2;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_3;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_4;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_5;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_6;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_7;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_8;
-import dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_9;
-
-public class Test_rem_int_lit16 extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_rem_int_lit16_1 t = new T_rem_int_lit16_1();
- assertEquals(0, t.run(8));
- }
-
- /**
- * @title Arguments = 10737, 4
- */
- public void testN2() {
- T_rem_int_lit16_1 t = new T_rem_int_lit16_1();
- assertEquals(1, t.run(10737));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_rem_int_lit16_1 t = new T_rem_int_lit16_1();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_rem_int_lit16_1 t = new T_rem_int_lit16_1();
- assertEquals(-2, t.run(-10));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_rem_int_lit16_2 t = new T_rem_int_lit16_2();
- assertEquals(1, t.run(22222));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_rem_int_lit16_3 t = new T_rem_int_lit16_3();
- assertEquals(-2235, t.run(-23235));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_rem_int_lit16_4 t = new T_rem_int_lit16_4();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Short.MIN_VALUE, -1
- */
- public void testB1() {
- T_rem_int_lit16_5 t = new T_rem_int_lit16_5();
- assertEquals(0, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Short.MIN_VALUE, 1
- */
- public void testB2() {
- T_rem_int_lit16_6 t = new T_rem_int_lit16_6();
- assertEquals(0, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Short.MAX_VALUE, 1
- */
- public void testB3() {
- T_rem_int_lit16_6 t = new T_rem_int_lit16_6();
- assertEquals(0, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Short.MIN_VALUE, 32767
- */
- public void testB4() {
- T_rem_int_lit16_7 t = new T_rem_int_lit16_7();
- assertEquals(-1, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 1, 32767
- */
- public void testB5() {
- T_rem_int_lit16_7 t = new T_rem_int_lit16_7();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @title Arguments = 1, -32768
- */
- public void testB6() {
- T_rem_int_lit16_8 t = new T_rem_int_lit16_8();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_rem_int_lit16_9 t = new T_rem_int_lit16_9();
- try {
- t.run(1);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.d
deleted file mode 100644
index 84c49ed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_1.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, 4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.java
deleted file mode 100644
index 75963ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_1 {
-
- public int run(int a) {
- int b = 4;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10.d
deleted file mode 100644
index 4cd1fe6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_10.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v8, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11.d
deleted file mode 100644
index a5d81e0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_11.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- rem-int/lit16 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12.d
deleted file mode 100644
index 80cab63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_12.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- rem-int/lit16 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13.d
deleted file mode 100644
index 2e40ee6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_13.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.d
deleted file mode 100644
index ebba20d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_2.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, -3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.java
deleted file mode 100644
index 7f40e12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_2 {
-
- public int run(int a) {
- int b = -3;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.d
deleted file mode 100644
index 0b65731..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_3.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, -3000
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.java
deleted file mode 100644
index ffd9b90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_3 {
-
- public int run(int a) {
- int b = -3000;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.d
deleted file mode 100644
index 9b96729..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_4.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, 15
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.java
deleted file mode 100644
index 759ed42..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_4 {
-
- public int run(float a) {
- int b = 15;
- return (int)a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.d
deleted file mode 100644
index 96218a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_5.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.java
deleted file mode 100644
index 7dd4dfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_5 {
-
- public int run(int a) {
- int b = -1;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.d
deleted file mode 100644
index 9139eec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_6.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.java
deleted file mode 100644
index d59e8a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_6 {
-
- public int run(int a) {
- int b = 1;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.d
deleted file mode 100644
index 9970a21..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_7.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, 32767
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.java
deleted file mode 100644
index 215598b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_7 {
-
- public int run(int a) {
- int b = 32767;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.d
deleted file mode 100644
index aa2208b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_8.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, -32768
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.java
deleted file mode 100644
index 77a94a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_8 {
-
- public int run(int a) {
- int b = -32768;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.d
deleted file mode 100644
index 91c45f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit16_9.java
-.class public dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit16 v0, v7, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.java
deleted file mode 100644
index 6c6d3cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit16.d;
-
-public class T_rem_int_lit16_9 {
-
- public int run(int a) {
- int b = 0;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java
deleted file mode 100644
index ffeeb40..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_1;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_2;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_3;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_4;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_5;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_6;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_7;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_8;
-import dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_9;
-
-public class Test_rem_int_lit8 extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_rem_int_lit8_1 t = new T_rem_int_lit8_1();
- assertEquals(0, t.run(8));
- }
-
- /**
- * @title Arguments = 123, 4
- */
- public void testN2() {
- T_rem_int_lit8_1 t = new T_rem_int_lit8_1();
- assertEquals(3, t.run(123));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_rem_int_lit8_1 t = new T_rem_int_lit8_1();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_rem_int_lit8_1 t = new T_rem_int_lit8_1();
- assertEquals(-2, t.run(-10));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_rem_int_lit8_2 t = new T_rem_int_lit8_2();
- assertEquals(0, t.run(123));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_rem_int_lit8_3 t = new T_rem_int_lit8_3();
- assertEquals(-3, t.run(-123));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_rem_int_lit8_4 t = new T_rem_int_lit8_4();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Byte.MIN_VALUE, -1
- */
- public void testB1() {
- T_rem_int_lit8_5 t = new T_rem_int_lit8_5();
- assertEquals(0, t.run(Byte.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Byte.MIN_VALUE, 1
- */
- public void testB2() {
- T_rem_int_lit8_6 t = new T_rem_int_lit8_6();
- assertEquals(0, t.run(Byte.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Byte.MAX_VALUE, 1
- */
- public void testB3() {
- T_rem_int_lit8_6 t = new T_rem_int_lit8_6();
- assertEquals(0, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Short.MIN_VALUE, 127
- */
- public void testB4() {
- T_rem_int_lit8_7 t = new T_rem_int_lit8_7();
- assertEquals(-2, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 1, 127
- */
- public void testB5() {
- T_rem_int_lit8_7 t = new T_rem_int_lit8_7();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @title Arguments = 1, -128
- */
- public void testB6() {
- T_rem_int_lit8_8 t = new T_rem_int_lit8_8();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_rem_int_lit8_9 t = new T_rem_int_lit8_9();
- try {
- t.run(1);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.d
deleted file mode 100644
index 7d69475..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_1.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, 4
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.java
deleted file mode 100644
index bf0f39d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_1 {
-
- public int run(int a) {
- int b = 4;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10.d
deleted file mode 100644
index 15ce8db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_10.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v8, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11.d
deleted file mode 100644
index 9fb2f77..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_11.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- rem-int/lit8 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12.d
deleted file mode 100644
index cc7cd5e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_12.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- rem-int/lit8 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13.d
deleted file mode 100644
index c35575e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_13.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v6, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.d
deleted file mode 100644
index 4887086..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_2.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, -3
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.java
deleted file mode 100644
index 3c05ec4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_2 {
-
- public int run(int a) {
- int b = -3;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.d
deleted file mode 100644
index 43413ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_3.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, -120
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.java
deleted file mode 100644
index 7e97956..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_3 {
-
- public int run(int a) {
- int b = -120;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.d
deleted file mode 100644
index 48cd590..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_4.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.java
deleted file mode 100644
index 431ee77..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_4 {
-
- public int run(float a) {
- int b = 10;
- return (int)a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.d
deleted file mode 100644
index ec86de1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_5.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.java
deleted file mode 100644
index c02f3e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_5 {
-
- public int run(int a) {
- int b = -1;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.d
deleted file mode 100644
index 8300e22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_6.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.java
deleted file mode 100644
index 92ad4d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_6 {
-
- public int run(int a) {
- int b = 1;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.d
deleted file mode 100644
index b1eeb15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_7.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, 127
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.java
deleted file mode 100644
index b4369d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_7 {
-
- public int run(int a) {
- int b = 127;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.d
deleted file mode 100644
index 08b0729..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_8.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, -128
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.java
deleted file mode 100644
index f28f470..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_8 {
-
- public int run(int a) {
- int b = -128;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.d
deleted file mode 100644
index 3c28049..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_int_lit8_9.java
-.class public dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- rem-int/lit8 v0, v7, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.java
deleted file mode 100644
index 5368944..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_int_lit8.d;
-
-public class T_rem_int_lit8_9 {
-
- public int run(int a) {
- int b = 0;
- return a%b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/Test_rem_long.java b/tools/vm-tests/src/dot/junit/opcodes/rem_long/Test_rem_long.java
deleted file mode 100644
index 271cd75..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/Test_rem_long.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_long.d.T_rem_long_1;
-import dot.junit.opcodes.rem_long.d.T_rem_long_3;
-
-public class Test_rem_long extends DxTestCase {
-
- /**
- * @title Arguments = 10000000000l, 4000000000l
- */
- public void testN1() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(2000000000l, t.run(10000000000l, 4000000000l));
- }
-
- /**
- * @title Arguments = 1234567890123l, 123456789l
- */
- public void testN2() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(123l, t.run(1234567890123l, 123456789l));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(0l, t.run(0l, 1234567890123l));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(-2000000000l, t.run(-10000000000l, 4000000000l));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(2000000000l, t.run(10000000000l, -4000000000l));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(-2000000000l, t.run(-10000000000l, -4000000000l));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and long makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_rem_long_3 t = new T_rem_long_3();
- try {
- t.run(500000l, 1.05d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, -1l
- */
- public void testB1() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, -1l));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1l
- */
- public void testB2() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, 1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, 1l
- */
- public void testB3() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(0l, t.run(Long.MAX_VALUE, 1l));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, Long.MAX_VALUE
- */
- public void testB4() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(-1l, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1l, Long.MAX_VALUE
- */
- public void testB5() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(1l, t.run(1l, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1l, Long.MIN_VALUE
- */
- public void testB6() {
- T_rem_long_1 t = new T_rem_long_1();
- assertEquals(1l, t.run(1l, Long.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_rem_long_1 t = new T_rem_long_1();
- try {
- t.run(1234567890123l, 0l);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.d
deleted file mode 100644
index 37cfd4d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_1.java
-.class public dot.junit.opcodes.rem_long.d.T_rem_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- rem-long v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.java
deleted file mode 100644
index 34e776a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_long.d;
-
-public class T_rem_long_1 {
-
- public long run(long a, long b) {
- return a % b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_2.d
deleted file mode 100644
index 867c397..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2.java
-.class public dot.junit.opcodes.rem_long.d.T_rem_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- rem-long v0, v12, v14
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.d
deleted file mode 100644
index 05b4c51..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_3.java
-.class public dot.junit.opcodes.rem_long.d.T_rem_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- rem-long v0, v10, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.java b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.java
deleted file mode 100644
index 33c00a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_long.d;
-
-public class T_rem_long_3 {
-
- public long run(long a, double b) {
- return a % (long)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_4.d
deleted file mode 100644
index 165258a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_4.java
-.class public dot.junit.opcodes.rem_long.d.T_rem_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)J
-.limit regs 14
-
- rem-long v0, v11, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_5.d
deleted file mode 100644
index ab089c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_5.java
-.class public dot.junit.opcodes.rem_long.d.T_rem_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JF)J
-.limit regs 14
-
- rem-long v0, v11, v13
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_6.d
deleted file mode 100644
index eb64800..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long/d/T_rem_long_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_6.java
-.class public dot.junit.opcodes.rem_long.d.T_rem_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- rem-long v0, v9, v12
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java
deleted file mode 100644
index e32f69c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_1;
-import dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_3;
-
-public class Test_rem_long_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 10000000000l, 4000000000l
- */
- public void testN1() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(2000000000l, t.run(10000000000l, 4000000000l));
- }
-
- /**
- * @title Arguments = 1234567890123l, 123456789l
- */
- public void testN2() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(123l, t.run(1234567890123l, 123456789l));
- }
-
- /**
- * @title Dividend = 0
- */
- public void testN3() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(0l, t.run(0l, 1234567890123l));
- }
-
- /**
- * @title Dividend is negative
- */
- public void testN4() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(-2000000000l, t.run(-10000000000l, 4000000000l));
- }
-
- /**
- * @title Divisor is negative
- */
- public void testN5() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(2000000000l, t.run(10000000000l, -4000000000l));
- }
-
- /**
- * @title Both Dividend and divisor are negative
- */
- public void testN6() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(-2000000000l, t.run(-10000000000l, -4000000000l));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and long makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_rem_long_2addr_3 t = new T_rem_long_2addr_3();
- try {
- t.run(500000l, 1.05d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, -1l
- */
- public void testB1() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, -1l));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1l
- */
- public void testB2() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, 1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, 1l
- */
- public void testB3() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(0l, t.run(Long.MAX_VALUE, 1l));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, Long.MAX_VALUE
- */
- public void testB4() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(-1l, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1l, Long.MAX_VALUE
- */
- public void testB5() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(1l, t.run(1l, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 1l, Long.MIN_VALUE
- */
- public void testB6() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- assertEquals(1l, t.run(1l, Long.MIN_VALUE));
- }
-
- /**
- * @title Divisor is 0
- */
- public void testE1() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- try {
- t.run(1234567890123l, 0l);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title (types of arguments - int, long).
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.d
deleted file mode 100644
index 83c111e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2addr_1.java
-.class public dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- rem-long/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.java
deleted file mode 100644
index 197ce60..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_long_2addr.d;
-
-public class T_rem_long_2addr_1 {
-
- public long run(long a, long b) {
- return a % b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2.d
deleted file mode 100644
index 79c9750..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2addr_2.java
-.class public dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- rem-long/2addr v12, v14
- return-wide v12
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.d
deleted file mode 100644
index 4f62b19..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2addr_3.java
-.class public dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 14
-
- rem-long/2addr v10, v12
- return-wide v10
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.java b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.java
deleted file mode 100644
index f86c707..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rem_long_2addr.d;
-
-public class T_rem_long_2addr_3 {
-
- public long run(long a, double b) {
- return a % (long)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4.d
deleted file mode 100644
index 2d0d1c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2addr_4.java
-.class public dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)J
-.limit regs 14
-
- rem-long/2addr v11, v12
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5.d
deleted file mode 100644
index 7d4ed96..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2addr_5.java
-.class public dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JF)J
-.limit regs 14
-
- rem-long/2addr v11, v13
- return-wide v11
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6.d
deleted file mode 100644
index 8952ae1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rem_long_2addr_6.java
-.class public dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 14
-
- rem-long/2addr v9, v12
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/Runner.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/Runner.java
deleted file mode 100644
index a2610ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/Runner.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object;
-
-public interface Runner {
- public void doit();
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/RunnerGenerator.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/RunnerGenerator.java
deleted file mode 100644
index 04644d7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/RunnerGenerator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object;
-
-public interface RunnerGenerator {
- public Runner run();
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/Test_return_object.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/Test_return_object.java
deleted file mode 100644
index 9336829..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/Test_return_object.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.return_object.d.T_return_object_1;
-import dot.junit.opcodes.return_object.d.T_return_object_12;
-import dot.junit.opcodes.return_object.d.T_return_object_13;
-import dot.junit.opcodes.return_object.d.T_return_object_2;
-import dot.junit.opcodes.return_object.d.T_return_object_6;
-import dot.junit.opcodes.return_object.d.T_return_object_8;
-
-
-public class Test_return_object extends DxTestCase {
- /**
- * @title simple
- */
- public void testN1() {
- T_return_object_1 t = new T_return_object_1();
- assertEquals("hello", t.run());
- }
-
- /**
- * @title simple
- */
- public void testN2() {
- T_return_object_1 t = new T_return_object_1();
- assertEquals(t, t.run2());
- }
-
- /**
- * @title return null
- */
- public void testN4() {
- T_return_object_2 t = new T_return_object_2();
- assertNull(t.run());
- }
-
- /**
- * @title check that frames are discarded and reinstananted correctly
- */
- public void testN5() {
- T_return_object_6 t = new T_return_object_6();
- assertEquals("hello", t.run());
- }
-
-
- /**
- * @title assignment compatibility (TChild returned as TSuper)
- */
- public void testN7() {
- //@uses dot.junit.opcodes.return_object.d.T_return_object_12
- //@uses dot.junit.opcodes.return_object.d.TChild
- //@uses dot.junit.opcodes.return_object.d.TSuper
- //@uses dot.junit.opcodes.return_object.d.TInterface
- T_return_object_12 t = new T_return_object_12();
- assertTrue(t.run());
- }
-
- /**
- * @title assignment compatibility (TChild returned as TInterface)
- */
- public void testN8() {
- //@uses dot.junit.opcodes.return_object.d.T_return_object_13
- //@uses dot.junit.opcodes.return_object.d.TChild
- //@uses dot.junit.opcodes.return_object.d.TSuper
- //@uses dot.junit.opcodes.return_object.d.TInterface
- T_return_object_13 t = new T_return_object_13();
- assertTrue(t.run());
- }
-
- /**
- * @title Method is synchronized but thread is not monitor owner
- */
- public void testE1() {
- T_return_object_8 t = new T_return_object_8();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
- }
-
-
- /**
- * @constraint B11
- * @title method's return type - void
- */
- public void testVFE1() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title method's return type - float
- */
- public void testVFE2() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title method's return type - long
- */
- public void testVFE3() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title types of argument - int
- */
- public void testVFE6() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of argument - long
- */
- public void testVFE7() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title assignment incompatible references
- */
- public void testVFE8() {
- //@uses dot.junit.opcodes.return_object.d.T_return_object_14
- //@uses dot.junit.opcodes.return_object.d.TChild
- //@uses dot.junit.opcodes.return_object.d.TSuper
- //@uses dot.junit.opcodes.return_object.d.TInterface
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title assignment incompatible references
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.return_object.d.T_return_object_15
- //@uses dot.junit.opcodes.return_object.Runner
- //@uses dot.junit.opcodes.return_object.RunnerGenerator
- //@uses dot.junit.opcodes.return_object.d.TSuper2
- try {
- RunnerGenerator rg = (RunnerGenerator) Class.forName(
- "dot.junit.opcodes.return_object.d.T_return_object_15").newInstance();
- Runner r = rg.run();
- assertFalse(r instanceof Runner);
- assertFalse(Runner.class.isAssignableFrom(r.getClass()));
- // only upon invocation of a concrete method,
- // a java.lang.IncompatibleClassChangeError is thrown
- r.doit();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_1.d
deleted file mode 100644
index b537c47..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_1.d
+++ /dev/null
@@ -1,40 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_1.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 3
-
- const-string v1, "hello"
- return-object v1
-.end method
-
-.method public run2()Ljava/lang/Object;
-.limit regs 3
- return-object v2
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_1.java
deleted file mode 100644
index ce9aed3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-public class T_return_object_1 {
-
- public String run() {
- return "hello";
- }
-
- public Object run2() {
- return this;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_10.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_10.d
deleted file mode 100644
index 66e762a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_10.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- const v1, 123
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_11.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_11.d
deleted file mode 100644
index c632133..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_11.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- const-wide v1, 123
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_12.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_12.d
deleted file mode 100644
index ea4c11a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_12.d
+++ /dev/null
@@ -1,43 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_12.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test()Ldot/junit/opcodes/return_object/d/TSuper;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/return_object/d/TChild
- invoke-direct {v1}, dot/junit/opcodes/return_object/d/TChild/<init>()V
- return-object v1
-.end method
-
-.method public run()Z
-.limit regs 4
-
- invoke-direct {v3}, dot/junit/opcodes/return_object/d/T_return_object_12/test()Ldot/junit/opcodes/return_object/d/TSuper;
- move-result-object v2
- instance-of v0, v2, dot/junit/opcodes/return_object/d/TChild
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_12.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_12.java
deleted file mode 100644
index 9040acc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_12.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-
-public class T_return_object_12 {
-
- private TSuper test() {
- return new TChild();
- }
-
- public boolean run() {
- TSuper t = test();
- return (t instanceof TChild);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_13.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_13.d
deleted file mode 100644
index 4cae4ce..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_13.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_13.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test()Ldot/junit/opcodes/return_object/d/TInterface;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/return_object/d/TChild
- invoke-direct {v1}, dot/junit/opcodes/return_object/d/TChild/<init>()V
- return-object v1
-.end method
-
-.method public run()Z
-.limit regs 4
-Label0:
-
- invoke-direct {v3}, dot/junit/opcodes/return_object/d/T_return_object_13/test()Ldot/junit/opcodes/return_object/d/TInterface;
- move-result-object v2
- instance-of v2, v2, dot/junit/opcodes/return_object/d/TChild
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_13.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_13.java
deleted file mode 100644
index cb180d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_13.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-
-public class T_return_object_13 {
-
- private TInterface test() {
- return new TChild();
- }
-
- public boolean run() {
- TInterface t = test();
- return (t instanceof TChild);
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_14.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_14.d
deleted file mode 100644
index cff2b12..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_14.d
+++ /dev/null
@@ -1,49 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_14.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_14
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private test()Ldot/junit/opcodes/return_object/d/TChild;
-.limit regs 6
-
- new-instance v0, dot/junit/opcodes/return_object/d/TSuper
- invoke-direct {v0}, dot/junit/opcodes/return_object/d/TSuper/<init>()V
-
- return-object v0
-.end method
-
-
-.method public run()Z
-.limit regs 6
-
- invoke-direct {v5}, dot/junit/opcodes/return_object/d/T_return_object_14/test()Ldot/junit/opcodes/return_object/d/TChild;
- move-result-object v1
-
- instance-of v0, v1, dot/junit/opcodes/return_object/d/TChild
-
- return v0
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_15.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_15.d
deleted file mode 100644
index 29377fa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_15.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_15.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_15
-.super java/lang/Object
-.implements dot/junit/opcodes/return_object/RunnerGenerator
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ldot/junit/opcodes/return_object/Runner;
-.limit regs 5
-
- new-instance v1, dot/junit/opcodes/return_object/d/TSuper2
- invoke-direct {v1}, dot/junit/opcodes/return_object/d/TSuper2/<init>()V
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_16.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_16.d
deleted file mode 100644
index 0b8dc5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_16.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_16.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_16
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- return-object v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_2.d
deleted file mode 100644
index f892233..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_2.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- const/4 v1, 0
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_2.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_2.java
deleted file mode 100644
index 916dcdd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-public class T_return_object_2 {
-
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_3.d
deleted file mode 100644
index 089fde7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_3.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- return-object v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_4.d
deleted file mode 100644
index 9b30169..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_4.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()F
-.limit regs 3
-
- const v2, 3.14
- return-object v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_5.d
deleted file mode 100644
index db9df1b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_5.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- return-object v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_6.d
deleted file mode 100644
index 582bd74..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_6.d
+++ /dev/null
@@ -1,64 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_6.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private static test()Ljava/lang/String;
-.limit regs 5
-
- const-string v0, "aaa"
- const-string v1, "bbb"
- const-string v2, "ccc"
- const-string v3, "ddd"
- return-object v3
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 10
- const-string v1, "a"
- const-string v2, "b"
- const-string v3, "c"
- invoke-static {}, dot/junit/opcodes/return_object/d/T_return_object_6/test()Ljava/lang/String;
- move-result-object v7
-
- const-string v8, "ddd"
- if-ne v7, v8, Label43
-
- const-string v7, "a"
- if-ne v1, v7, Label43
-
- const-string v7, "b"
- if-ne v2, v7, Label43
-
- const-string v7, "c"
- if-ne v3, v7, Label43
-
- const-string v0, "hello"
- return-object v0
-Label43:
- const-string v0, "a"
- return-object v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_6.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_6.java
deleted file mode 100644
index 05cd845..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_6.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-public class T_return_object_6 {
-
- public String run() {
- return "hello";
- }
-
- private static String test() {
- String a = "aaa";
- String b = "bbb";
- String c = "ccc";
- return "ddd";
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_8.d
deleted file mode 100644
index bc2f85f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_8.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_object_8.java
-.class public dot.junit.opcodes.return_object.d.T_return_object_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private declared_synchronized test()Ljava/lang/String;
-.limit regs 4
-
- monitor-exit v3
- const-string v0, "abc"
- return-object v0
-.end method
-
-.method public run()Z
-.limit regs 3
-
- invoke-direct {v2}, dot/junit/opcodes/return_object/d/T_return_object_8/test()Ljava/lang/String;
-
- const v0, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_8.java
deleted file mode 100644
index 65fb8e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/T_return_object_8.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-public class T_return_object_8 {
-
- private synchronized String test() {
- return "abc";
- }
-
- public boolean run() {
- test();
- return true;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/TestStubs.d b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/TestStubs.d
deleted file mode 100644
index 44f819f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/TestStubs.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source TestStubs.java
-.interface dot.junit.opcodes.return_object.d.TInterface
-
-.source TestStubs.java
-.class dot.junit.opcodes.return_object.d.TSuper
-.super java/lang/Object
-.implements dot.junit.opcodes.return_object.d.TInterface
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.source TestStubs.java
-.class dot.junit.opcodes.return_object.d.TChild
-.super dot.junit.opcodes.return_object.d.TSuper
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, dot/junit/opcodes/return_object/d/TSuper/<init>()V
- return-void
-.end method
-
-.source TestStubs.java
-.class dot.junit.opcodes.return_object.d.TSuper2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.source TestStubs.java
-.class dot.junit.opcodes.return_object.d.TestStubs
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/TetsStubs.java b/tools/vm-tests/src/dot/junit/opcodes/return_object/d/TetsStubs.java
deleted file mode 100644
index 575ec0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_object/d/TetsStubs.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_object.d;
-
-
-interface TInterface{
-
-}
-
-class TSuper implements TInterface {
-
-}
-
-class TChild extends TSuper {
-
-}
-
-class TSuper2 {
-
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/Test_return_void.java b/tools/vm-tests/src/dot/junit/opcodes/return_void/Test_return_void.java
deleted file mode 100644
index e5903e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/Test_return_void.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_void;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.return_void.d.T_return_void_1;
-import dot.junit.opcodes.return_void.d.T_return_void_3;
-
-public class Test_return_void extends DxTestCase {
- /**
- * @title check that frames are discarded and reinstananted correctly
- */
- public void testN1() {
- T_return_void_1 t = new T_return_void_1();
- assertEquals(123456, t.run());
- }
-
-
- /**
- * @title Method is synchronized but thread is not monitor owner
- */
- public void testE1() {
- T_return_void_3 t = new T_return_void_3();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint B11
- * @title method's return type - int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.return_void.d.T_return_void_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title method's return type - reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.return_void.d.T_return_void_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title method's return type - wide
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.return_void.d.T_return_void_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_1.d b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_1.d
deleted file mode 100644
index 739e288..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_1.d
+++ /dev/null
@@ -1,65 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_void_1.java
-.class public dot.junit.opcodes.return_void.d.T_return_void_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- const v1, 1
- const v2, 2
- const v3, 3
-
- invoke-static {}, dot/junit/opcodes/return_void/d/T_return_void_1/test()V
-
- const v4, 1
- if-ne v1, v4, Label0
-
- const v4, 2
- if-ne v2, v4, Label0
-
- const v4, 3
- if-ne v3, v4, Label0
-
- const v0, 123456
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-.method private static test()V
-.limit regs 5
-
- const v0, 9999
- const v1, 0xaaa
- const v2, 0xbbbb
- const v3, 0xcccc
- const v4, 0xdddd
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_1.java b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_1.java
deleted file mode 100644
index 60615c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_void.d;
-
-public class T_return_void_1 {
-
- public int run() {
- test();
- return 123456;
- }
-
- private static void test() {
- int a = 0xaaaa;
- int b = 0xbbbb;
- int c = 0xcccc;
- return;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_3.d b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_3.d
deleted file mode 100644
index ff12b06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_3.d
+++ /dev/null
@@ -1,44 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_void_3.java
-.class public dot.junit.opcodes.return_void.d.T_return_void_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private declared_synchronized test()V
-.limit regs 1
-
- monitor-exit v0
- return-void
-.end method
-
-
-
-.method public run()Z
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/return_void/d/T_return_void_3/test()V
-
- const v0, 1
- return v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_3.java b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_3.java
deleted file mode 100644
index de9cb3a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_void.d;
-
-public class T_return_void_3 {
-
- private synchronized void test() {
- return;
- }
-
- public boolean run() {
- test();
- return true;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_5.d b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_5.d
deleted file mode 100644
index 172f5d0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_void_5.java
-.class public dot.junit.opcodes.return_void.d.T_return_void_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_6.d b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_6.d
deleted file mode 100644
index 001e8b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_void_6.java
-.class public dot.junit.opcodes.return_void.d.T_return_void_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 6
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_7.d b/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_7.d
deleted file mode 100644
index 3aee8df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_void/d/T_return_void_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_void_7.java
-.class public dot.junit.opcodes.return_void.d.T_return_void_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 6
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/Test_return_wide.java b/tools/vm-tests/src/dot/junit/opcodes/return_wide/Test_return_wide.java
deleted file mode 100644
index c97f0d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/Test_return_wide.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.return_wide.d.T_return_wide_1;
-import dot.junit.opcodes.return_wide.d.T_return_wide_3;
-
-public class Test_return_wide extends DxTestCase {
- /**
- * @title check that frames are discarded and reinstananted correctly
- */
- public void testN1() {
- T_return_wide_1 t = new T_return_wide_1();
- assertEquals(123456, t.run());
- }
-
- /**
- * @title Method is synchronized but thread is not monitor owner
- */
- public void testE1() {
- T_return_wide_3 t = new T_return_wide_3();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
- }
-
-
- /**
- * @constraint B11
- * @title method's return type - int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B11
- * @title method's return type - reference
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title return-wide on single-width register
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.d
deleted file mode 100644
index 57ffaf3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.d
+++ /dev/null
@@ -1,71 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_wide_1.java
-.class public dot.junit.opcodes.return_wide.d.T_return_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 10
-
- const v1, 1
- const v2, 2
- const v3, 3
-
- const-wide v4, 0xdddd
-
- invoke-static {}, dot/junit/opcodes/return_wide/d/T_return_wide_1/test()J
- move-result-wide v6
-
- cmp-long v0, v4, v6
- if-nez v0, Label0
-
- const v4, 1
- if-ne v1, v4, Label0
-
- const v4, 2
- if-ne v2, v4, Label0
-
- const v4, 3
- if-ne v3, v4, Label0
-
- const v0, 123456
- return v0
-
-Label0:
- const v0, 0
- return v0
-.end method
-
-.method private static test()J
-.limit regs 6
-
- const v0, 9999
- const v1, 0xaaa
- const v2, 0xbbbb
- const v3, 0xcccc
-
- const-wide v4, 0xdddd
- return-wide v4
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.java
deleted file mode 100644
index a96cbef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_wide.d;
-
-public class T_return_wide_1 {
-
- public int run() {
- test();
- return 123456;
- }
-
- private static long test() {
- int a = 0xaaaa;
- int b = 0xbbbb;
- int c = 0xcccc;
- return 1l;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d
deleted file mode 100644
index 1a6fdb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_wide_3.java
-.class public dot.junit.opcodes.return_wide.d.T_return_wide_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method private declared_synchronized test()D
-.limit regs 4
-
- monitor-exit v3
- const-wide v0, 1.0
- return-wide v0
-.end method
-
-
-
-.method public run()Z
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/return_wide/d/T_return_wide_3/test()D
-
- const v0, 1
- return v0
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.java b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.java
deleted file mode 100644
index b0bae67..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.return_wide.d;
-
-public class T_return_wide_3 {
-
- private synchronized long test() {
- return 1;
- }
-
- public boolean run() {
- test();
- return true;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_5.d
deleted file mode 100644
index 692ac2b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_wide_5.java
-.class public dot.junit.opcodes.return_wide.d.T_return_wide_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 6
-
- const v0, 1
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_6.d
deleted file mode 100644
index 3360ab7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_wide_6.java
-.class public dot.junit.opcodes.return_wide.d.T_return_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 6
-
- const-wide v0, 1
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_7.d
deleted file mode 100644
index 0363fcc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_wide_7.java
-.class public dot.junit.opcodes.return_wide.d.T_return_wide_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 6
-
- return-wide v6
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_8.d
deleted file mode 100644
index be64ae1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/return_wide/d/T_return_wide_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_return_wide_8.java
-.class public dot.junit.opcodes.return_wide.d.T_return_wide_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 6
-
- const v0, 0
- const v1, 0
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java
deleted file mode 100644
index bb63e7a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_1;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_2;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_3;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_4;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_5;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_6;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_7;
-import dot.junit.opcodes.rsub_int.d.T_rsub_int_12;
-
-public class Test_rsub_int extends DxTestCase {
-
- /**
- * @title normal test - check different values
- */
- public void testN1() {
- T_rsub_int_1 t = new T_rsub_int_1();
- assertEquals("Subtest_1 is failed", -4, t.run(8));
- assertEquals("Subtest_2 is failed",45, t.run1(15));
- assertEquals("Subtest_3 is failed",0, t.run2(20));
- assertEquals("Subtest_4 is failed",-35, t.run3(10));
- assertEquals("Subtest_5 is failed",-20, t.run4(-50));
- assertEquals("Subtest_6 is failed",20, t.run5(-70));
- }
-
- /**
- * @title normal test - check different values
- */
- public void testN2() {
- T_rsub_int_2 t = new T_rsub_int_2();
- assertEquals("Subtest_1 is failed",255, t.run(0));
- assertEquals("Subtest_2 is failed",-32768, t.run1(0));
- assertEquals("Subtest_3 is failed",-15, t.run2(15));
- assertEquals("Subtest_4 is failed",123, t.run2(-123));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_rsub_int_12 t = new T_rsub_int_12();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title
- * 1: a = Integer.MAX_VALUE, b = 0, b-a = -Integer.MAX_VALUE
- * 2: a = Short.MAX_VALUE, b = 0, b-a = -Short.MAX_VALUE
- */
- public void testB1() {
- T_rsub_int_3 t = new T_rsub_int_3();
- assertEquals(-Integer.MAX_VALUE, t.run(Integer.MAX_VALUE));
- assertEquals(-Short.MAX_VALUE, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = 0, b-a = Integer.MIN_VALUE
- * 2: a = Short.MIN_VALUE, b = 0, b-a = 32768
- */
- public void testB2() {
- T_rsub_int_3 t = new T_rsub_int_3();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE));
- assertEquals(32768, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title (a = 0, b = 0, b-a = 0)
- */
- public void testB3() {
- T_rsub_int_3 t = new T_rsub_int_3();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title
- * 1: a = 0, b = Short.MAX_VALUE, b-a = Short.MAX_VALUE
- * 2: a = 1, b = Short.MAX_VALUE, b-a = 32766
- * 3: a = -1, b = Short.MAX_VALUE, b-a = 32768
- */
- public void testB4() {
- T_rsub_int_4 t = new T_rsub_int_4();
- assertEquals(Short.MAX_VALUE, t.run(0));
- assertEquals(32766, t.run(1));
- assertEquals(32768, t.run(-1));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = Short.MAX_VALUE, b-a = -2147450881
- * 2: a = Integer.MAX_VALUE, b = Short.MAX_VALUE, b-a = -2147450880
- * 3: a = Short.MIN_VALUE, b = Short.MAX_VALUE, b-a = 65535
- */
- public void testB5() {
- T_rsub_int_4 t = new T_rsub_int_4();
- assertEquals(-2147450881, t.run(Integer.MIN_VALUE));
- assertEquals(-2147450880, t.run(Integer.MAX_VALUE));
- assertEquals(65535, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title
- * 1: a = 0, b = Short.MIN_VALUE, b-a = Short.MIN_VALUE
- * 2: a = 1, b = Short.MIN_VALUE, b-a = -32769
- * 3: a = -1, b = Short.MIN_VALUE, b-a = -32767
- */
- public void testB6() {
- T_rsub_int_5 t = new T_rsub_int_5();
- assertEquals(Short.MIN_VALUE, t.run(0));
- assertEquals(-32769, t.run(1));
- assertEquals(-32767, t.run(-1));
- }
-
- /**
- * @title
- * 1: a = Integer.MAX_VALUE, b = Short.MIN_VALUE, b-a = 2147450881
- * 2: a = Integer.MIN_VALUE, b = Short.MIN_VALUE, b-a = 2147450880
- * 3: a = Short.MAX_VALUE, b = Short.MIN_VALUE, b-a = -65535
- */
- public void testB7() {
- T_rsub_int_5 t = new T_rsub_int_5();
- assertEquals(2147450881, t.run(Integer.MAX_VALUE));
- assertEquals(2147450880, t.run(Integer.MIN_VALUE));
- assertEquals(-65535, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = -1, b-a = Integer.MAX_VALUE
- * 2: a = Short.MIN_VALUE, b = -1, b-a = Short.MAX_VALUE
- */
- public void testB8() {
- T_rsub_int_6 t = new T_rsub_int_6();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MIN_VALUE));
- assertEquals(Short.MAX_VALUE, t.run(Short.MIN_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MAX_VALUE, b = -1, b-a = Integer.MIN_VALUE
- * 2: a = Short.MAX_VALUE, b = -1, b-a = -32768
- */
- public void testB9() {
- T_rsub_int_6 t = new T_rsub_int_6();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE));
- assertEquals(-32768, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = 1, b-a = -Integer.MAX_VALUE
- * 2: a = Integer.MAX_VALUE, b = 1, b-a = -2147483646
- */
- public void testB10() {
- T_rsub_int_7 t = new T_rsub_int_7();
- assertEquals(-Integer.MAX_VALUE, t.run(Integer.MIN_VALUE));
- assertEquals(-2147483646, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Short.MIN_VALUE, b = 1, b-a = 32769
- * 2: a = Short.MAX_VALUE, b = 1, b-a = -32766
- */
- public void testB11() {
- T_rsub_int_7 t = new T_rsub_int_7();
- assertEquals(32769, t.run(Short.MIN_VALUE));
- assertEquals(-32766, t.run(Short.MAX_VALUE));
- }
-
- /**
- * @title (a = 1, b = 1, b-a = 0)
- */
- public void testB12() {
- T_rsub_int_7 t = new T_rsub_int_7();
- assertEquals(0, t.run(1));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.d
deleted file mode 100644
index b5124e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.d
+++ /dev/null
@@ -1,67 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_1.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, 4
- return v0
-.end method
-
-.method public run1(I)I
-.limit regs 4
-
- rsub-int v0, v3, 60
- return v0
-.end method
-
-.method public run2(I)I
-.limit regs 4
-
- rsub-int v0, v3, 20
- return v0
-.end method
-
-.method public run3(I)I
-.limit regs 4
-
- rsub-int v0, v3, -25
- return v0
-.end method
-
-.method public run4(I)I
-.limit regs 4
-
- rsub-int v0, v3, -70
- return v0
-.end method
-
-.method public run5(I)I
-.limit regs 4
-
- rsub-int v0, v3, -50
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.java
deleted file mode 100644
index f90f354..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_1 {
-
- public int run(int a) {
- int b = 4;
- return b-a;
- }
-
- public int run1(int a) {
- int b = 60;
- return b-a;
- }
-
- public int run2(int a) {
- int b = 20;
- return b-a;
- }
-
- public int run3(int a) {
- int b = -25;
- return b-a;
- }
-
- public int run4(int a) {
- int b = -70;
- return b-a;
- }
-
- public int run5(int a) {
- int b = -50;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_10.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_10.d
deleted file mode 100644
index 544a12c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_10.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_10.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 4
-
- rsub-int v0, v2, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_11.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_11.d
deleted file mode 100644
index e9a9b26..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_11.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_11.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v2, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.d
deleted file mode 100644
index 9c1ffec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_12.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
-
- rsub-int v0, v3, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.java
deleted file mode 100644
index d3b3a4d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_12 {
-
- public int run(float a) {
- int b = 10;
- return b-(int)a;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.d
deleted file mode 100644
index 4d63eea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_2.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, 255
- return v0
-.end method
-
-.method public run1(I)I
-.limit regs 4
-
- rsub-int v0, v3, -32768
- return v0
-.end method
-
-.method public run2(I)I
-.limit regs 4
-
- rsub-int v0, v3, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.java
deleted file mode 100644
index b1d8e90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_2 {
-
- public int run(int a) {
- int b = 255;
- return b-a;
- }
-
- public int run1(int a) {
- int b = -32768;
- return b-a;
- }
-
- public int run2(int a) {
- int b = 0;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.d
deleted file mode 100644
index 23efe0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_3.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.java
deleted file mode 100644
index b060bd2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_3 {
-
- public int run(int a) {
- int b = 0;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.d
deleted file mode 100644
index c37f9da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_4.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, 32767
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.java
deleted file mode 100644
index 5b38c5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_4 {
-
- public int run(int a) {
- int b = Short.MAX_VALUE;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.d
deleted file mode 100644
index 473020a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_5.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, -32768
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.java
deleted file mode 100644
index 259002c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_5 {
-
- public int run(int a) {
- int b = Short.MIN_VALUE;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.d
deleted file mode 100644
index e902f19..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_6.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.java
deleted file mode 100644
index 221f348..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_6 {
-
- public int run(int a) {
- int b = -1;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.d
deleted file mode 100644
index 6bb3571..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_7.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v3, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.java
deleted file mode 100644
index 180e76c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int.d;
-
-public class T_rsub_int_7 {
-
- public int run(int a) {
- int b = 1;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_8.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_8.d
deleted file mode 100644
index 9494e21..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_8.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int v0, v4, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_9.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_9.d
deleted file mode 100644
index 12b5fe4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_9.java
-.class public dot.junit.opcodes.rsub_int.d.T_rsub_int_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 4
-
- rsub-int v0, v2, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java
deleted file mode 100644
index 44dc89a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_1;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_2;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_3;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_4;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_5;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_6;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_7;
-import dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_12;
-
-public class Test_rsub_int_lit8 extends DxTestCase {
-
- /**
- * @title normal test - check different values
- */
- public void testN1() {
- T_rsub_int_lit8_1 t = new T_rsub_int_lit8_1();
- assertEquals("Subtest_1 is failed", -4, t.run(8));
- assertEquals("Subtest_2 is failed",45, t.run1(15));
- assertEquals("Subtest_3 is failed",0, t.run2(20));
- assertEquals("Subtest_4 is failed",-35, t.run3(10));
- assertEquals("Subtest_5 is failed",-20, t.run4(-50));
- assertEquals("Subtest_6 is failed",20, t.run5(-70));
- }
-
- /**
- * @title normal test - check different values
- */
- public void testN2() {
- T_rsub_int_lit8_2 t = new T_rsub_int_lit8_2();
- assertEquals("Subtest_1 is failed",123, t.run(0));
- assertEquals("Subtest_2 is failed",-123, t.run1(0));
- assertEquals("Subtest_3 is failed",-15, t.run2(15));
- assertEquals("Subtest_4 is failed",85, t.run2(-85));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_rsub_int_lit8_12 t = new T_rsub_int_lit8_12();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title
- * 1: a = Integer.MAX_VALUE, b = 0, b-a = -Integer.MAX_VALUE
- * 2: a = Byte.MAX_VALUE, b = 0, b-a = -Byte.MAX_VALUE
- */
- public void testB1() {
- T_rsub_int_lit8_3 t = new T_rsub_int_lit8_3();
- assertEquals(-Integer.MAX_VALUE, t.run(Integer.MAX_VALUE));
- assertEquals(-Byte.MAX_VALUE, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = 0, b-a = Integer.MIN_VALUE
- * 2: a = Byte.MIN_VALUE, b = 0, b-a = 128
- */
- public void testB2() {
- T_rsub_int_lit8_3 t = new T_rsub_int_lit8_3();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE));
- assertEquals(128, t.run(Byte.MIN_VALUE));
- }
-
- /**
- * @title (a = 0, b = 0, b-a = 0)
- */
- public void testB3() {
- T_rsub_int_lit8_3 t = new T_rsub_int_lit8_3();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title
- * 1: a = 0, b = Byte.MAX_VALUE, b-a = Byte.MAX_VALUE
- * 2: a = 1, b = Byte.MAX_VALUE, b-a = 126
- * 3: a = -1, b = Byte.MAX_VALUE, b-a = 128
- */
- public void testB4() {
- T_rsub_int_lit8_4 t = new T_rsub_int_lit8_4();
- assertEquals(Byte.MAX_VALUE, t.run(0));
- assertEquals(126, t.run(1));
- assertEquals(128, t.run(-1));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = Byte.MAX_VALUE, b-a = -2147483521
- * 2: a = Integer.MAX_VALUE, b = Byte.MAX_VALUE, b-a = -2147483520
- * 3: a = Byte.MIN_VALUE, b = Byte.MAX_VALUE, b-a = 255
- */
- public void testB5() {
- T_rsub_int_lit8_4 t = new T_rsub_int_lit8_4();
- assertEquals(-2147483521, t.run(Integer.MIN_VALUE));
- assertEquals(-2147483520, t.run(Integer.MAX_VALUE));
- assertEquals(255, t.run(Byte.MIN_VALUE));
- }
-
- /**
- * @title
- * 1: a = 0, b = Byte.MIN_VALUE, b-a = Byte.MIN_VALUE
- * 2: a = 1, b = Byte.MIN_VALUE, b-a = -129
- * 3: a = -1, b = Byte.MIN_VALUE, b-a = -127
- */
- public void testB6() {
- T_rsub_int_lit8_5 t = new T_rsub_int_lit8_5();
- assertEquals(Byte.MIN_VALUE, t.run(0));
- assertEquals(-129, t.run(1));
- assertEquals(-127, t.run(-1));
- }
-
- /**
- * @title
- * 1: a = Integer.MAX_VALUE, b = Byte.MIN_VALUE, b-a = 2147483521
- * 2: a = Integer.MIN_VALUE, b = Byte.MIN_VALUE, b-a = 2147483520
- * 3: a = Byte.MAX_VALUE, b = Byte.MIN_VALUE, b-a = -255
- */
- public void testB7() {
- T_rsub_int_lit8_5 t = new T_rsub_int_lit8_5();
- assertEquals(2147483521, t.run(Integer.MAX_VALUE));
- assertEquals(2147483520, t.run(Integer.MIN_VALUE));
- assertEquals(-255, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = -1, b-a = Integer.MAX_VALUE
- * 2: a = Byte.MIN_VALUE, b = -1, b-a = Byte.MAX_VALUE
- */
- public void testB8() {
- T_rsub_int_lit8_6 t = new T_rsub_int_lit8_6();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MIN_VALUE));
- assertEquals(Byte.MAX_VALUE, t.run(Byte.MIN_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MAX_VALUE, b = -1, b-a = Integer.MIN_VALUE
- * 2: a = Byte.MAX_VALUE, b = -1, b-a = Byte.MIN_VALUE
- */
- public void testB9() {
- T_rsub_int_lit8_6 t = new T_rsub_int_lit8_6();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE));
- assertEquals(Byte.MIN_VALUE, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Integer.MIN_VALUE, b = 1, b-a = -Integer.MAX_VALUE
- * 2: a = Integer.MAX_VALUE, b = 1, b-a = -2147483646
- */
- public void testB10() {
- T_rsub_int_lit8_7 t = new T_rsub_int_lit8_7();
- assertEquals(-Integer.MAX_VALUE, t.run(Integer.MIN_VALUE));
- assertEquals(-2147483646, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title
- * 1: a = Byte.MIN_VALUE, b = 1, b-a = 129
- * 2: a = Byte.MAX_VALUE, b = 1, b-a = -126
- */
- public void testB11() {
- T_rsub_int_lit8_7 t = new T_rsub_int_lit8_7();
- assertEquals(129, t.run(Byte.MIN_VALUE));
- assertEquals(-126, t.run(Byte.MAX_VALUE));
- }
-
- /**
- * @title (a = 1, b = 1, b-a = 0)
- */
- public void testB12() {
- T_rsub_int_lit8_7 t = new T_rsub_int_lit8_7();
- assertEquals(0, t.run(1));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.d
deleted file mode 100644
index fd45062..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.d
+++ /dev/null
@@ -1,67 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_1.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 4
- return v0
-.end method
-
-.method public run1(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 60
- return v0
-.end method
-
-.method public run2(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 20
- return v0
-.end method
-
-.method public run3(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, -25
- return v0
-.end method
-
-.method public run4(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, -70
- return v0
-.end method
-
-.method public run5(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, -50
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.java
deleted file mode 100644
index e489328..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_1 {
-
- public int run(int a) {
- int b = 4;
- return b-a;
- }
-
- public int run1(int a) {
- int b = 60;
- return b-a;
- }
-
- public int run2(int a) {
- int b = 20;
- return b-a;
- }
-
- public int run3(int a) {
- int b = -25;
- return b-a;
- }
-
- public int run4(int a) {
- int b = -70;
- return b-a;
- }
-
- public int run5(int a) {
- int b = -50;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10.d
deleted file mode 100644
index a8e37a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_10.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 4
-
- rsub-int/lit8 v0, v2, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11.d
deleted file mode 100644
index 615eede..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_11.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v2, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.d
deleted file mode 100644
index 7490328..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_12.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_12
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.java
deleted file mode 100644
index 9612590..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_12 {
-
- public int run(float a) {
- int b = 10;
- return b-(int)a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.d
deleted file mode 100644
index fa026fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_2.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 123
- return v0
-.end method
-
-.method public run1(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, -123
- return v0
-.end method
-
-.method public run2(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.java
deleted file mode 100644
index 036ec06..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_2 {
-
- public int run(int a) {
- int b = 123;
- return b-a;
- }
-
- public int run1(int a) {
- int b = -123;
- return b-a;
- }
-
- public int run2(int a) {
- int b = 0;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.d
deleted file mode 100644
index b9b5c3f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_3.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.java
deleted file mode 100644
index deb1885..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_3 {
-
- public int run(int a) {
- int b = 0;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.d
deleted file mode 100644
index b330a45..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_4.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 127
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.java
deleted file mode 100644
index 72ddcff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_4 {
-
- public int run(int a) {
- int b = Byte.MAX_VALUE;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.d
deleted file mode 100644
index 77a0e8b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_5.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, -128
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.java
deleted file mode 100644
index 1ec8d63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_5 {
-
- public int run(int a) {
- int b = Byte.MIN_VALUE;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.d
deleted file mode 100644
index bd5d5ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_6.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.java
deleted file mode 100644
index bfe342c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_6 {
-
- public int run(int a) {
- int b = -1;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.d
deleted file mode 100644
index 18cd602..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_7.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v3, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.java
deleted file mode 100644
index ca23fb0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.rsub_int_lit8.d;
-
-public class T_rsub_int_lit8_7 {
-
- public int run(int a) {
- int b = 1;
- return b-a;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8.d
deleted file mode 100644
index 69df5ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_8.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 4
-
- rsub-int/lit8 v0, v4, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9.d
deleted file mode 100644
index 4db3540..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_rsub_int_lit8_9.java
-.class public dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 4
-
- rsub-int/lit8 v0, v2, 10
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget/TestStubs.java
deleted file mode 100644
index 4c49c61..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget;
-
-public class TestStubs {
- // used by testVFE4
- private static int TestStubField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/Test_sget.java b/tools/vm-tests/src/dot/junit/opcodes/sget/Test_sget.java
deleted file mode 100644
index 981b19a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/Test_sget.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget.d.T_sget_1;
-import dot.junit.opcodes.sget.d.T_sget_11;
-import dot.junit.opcodes.sget.d.T_sget_12;
-import dot.junit.opcodes.sget.d.T_sget_13;
-import dot.junit.opcodes.sget.d.T_sget_2;
-import dot.junit.opcodes.sget.d.T_sget_5;
-import dot.junit.opcodes.sget.d.T_sget_6;
-import dot.junit.opcodes.sget.d.T_sget_7;
-import dot.junit.opcodes.sget.d.T_sget_8;
-import dot.junit.opcodes.sget.d.T_sget_9;
-
-public class Test_sget extends DxTestCase {
-
- /**
- * @title type - int
- */
- public void testN1() {
- T_sget_1 t = new T_sget_1();
- assertEquals(5, t.run());
- }
-
- /**
- * @title type - float
- */
- public void testN2() {
- T_sget_2 t = new T_sget_2();
- assertEquals(123f, t.run());
- }
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget.d.T_sget_1
- //@uses dot.junit.opcodes.sget.d.T_sget_11
- T_sget_11 t = new T_sget_11();
- assertEquals(10, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
- T_sget_5 t = new T_sget_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sget_9 t = new T_sget_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read integer from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget.d.T_sget_6
- //@uses dot.junit.opcodes.sget.TestStubs
- try {
- new T_sget_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget.d.T_sget_12
- //@uses dot.junit.opcodes.sget.d.T_sget_1
- try {
- new T_sget_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget shall not work for boolean fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget shall not work for byte fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_1.d
deleted file mode 100644
index 35e5808..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_1.java
-.class public dot.junit.opcodes.sget.d.T_sget_1
-.super java/lang/Object
-
-.field public static i1 I
-.field protected static p1 I
-.field private static pvt1 I
-
-.method static <clinit>()V
-.limit regs 1
- const/4 v0, 5
- sput v0, dot.junit.opcodes.sget.d.T_sget_1.i1 I
-
- const/16 v0, 10
- sput v0, dot.junit.opcodes.sget.d.T_sget_1.p1 I
-
- const/16 v0, 20
- sput v0, dot.junit.opcodes.sget.d.T_sget_1.pvt1 I
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_1.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_1.java
deleted file mode 100644
index 7514f03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_1 {
- public static int i1 = 5;
- protected static int p1 = 10;
- private static int pvt1 = 20;
-
- public int run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_11.d
deleted file mode 100644
index fb446be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_11.java
-.class public dot.junit.opcodes.sget.d.T_sget_11
-.super dot/junit/opcodes/sget/d/T_sget_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget/d/T_sget_1/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_1.p1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_11.java
deleted file mode 100644
index 26c6cb3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_11 extends T_sget_1 {
-
- public int run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_12.d
deleted file mode 100644
index b1e9093..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_12.java
-.class public dot.junit.opcodes.sget.d.T_sget_12
-.super dot/junit/opcodes/sget/d/T_sget_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget/d/T_sget_1/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_1.pvt1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_12.java
deleted file mode 100644
index f4232d3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_12 {
- public int run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_13.d
deleted file mode 100644
index 7122dbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_13.java
-.class public dot.junit.opcodes.sget.d.T_sget_13
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_13.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_13.java
deleted file mode 100644
index a1d862f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_13 {
- public void run(){
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_14.d
deleted file mode 100644
index 43ed17b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_14.java
-.class public dot.junit.opcodes.sget.d.T_sget_14
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_15.d
deleted file mode 100644
index a9d65e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_15.java
-.class public dot.junit.opcodes.sget.d.T_sget_15
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_16.d
deleted file mode 100644
index 71602db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_16.java
-.class public dot.junit.opcodes.sget.d.T_sget_16
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_16.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_17.d
deleted file mode 100644
index e7bdc56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_17.java
-.class public dot.junit.opcodes.sget.d.T_sget_17
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_18.d
deleted file mode 100644
index 62dbc28..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_18.java
-.class public dot.junit.opcodes.sget.d.T_sget_18
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_18.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_19.d
deleted file mode 100644
index 0f3374d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_19.java
-.class public dot.junit.opcodes.sget.d.T_sget_19
-.super java/lang/Object
-
-.field public static i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_2.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_2.d
deleted file mode 100644
index de5c7cb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_2.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_2.java
-.class public dot.junit.opcodes.sget.d.T_sget_2
-.super java/lang/Object
-
-.field public static val F
-
-.method static <clinit>()V
-.limit regs 2
- const v0, 123.0
- sput v0, dot.junit.opcodes.sget.d.T_sget_2.val F
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()F
-.limit regs 4
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_2.val F
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_2.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_2.java
deleted file mode 100644
index ff7bdee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_2 {
-
- public static float val = 123.0f;
-
- public float run() {
- return val;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_20.d
deleted file mode 100644
index e03ccd6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_20.java
-.class public dot.junit.opcodes.sget.d.T_sget_20
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v0, dot.junit.opcodes.sget.d.T_sget_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_3.d
deleted file mode 100644
index 1932bb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_3.java
-.class public dot.junit.opcodes.sget.d.T_sget_3
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget v3, dot.junit.opcodes.sget.d.T_sget_3.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_4.d
deleted file mode 100644
index 761c38f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_4.java
-.class public dot.junit.opcodes.sget.d.T_sget_4
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_4.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_4.dfh
deleted file mode 100644
index 4e7aba1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget/d/T_sget_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget/d/T_sget_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 69ff3a97
- 97 3A FF 69
-// parsed: offset 12, len 20: signature : 3483...6e37
- 34 83 98 B4 CA 38 A5 6E 4C 43 40 55 16 41 5A 69 D0 18 6E 37
-// parsed: offset 32, len 4: file_size : 544
- 20 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 408 (0x000198)
- 98 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 296
- 28 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "I"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/sget/d/T_sget_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 344 (0x000158) "Ljava/lang/Object;"
- 58 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 364 (0x00016c) "T_sget_4.java"
- 6C 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 379 (0x00017b) "V"
- 7B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 382 (0x00017e) "i1"
- 7E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 386 (0x000182) "run"
- 82 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sget/d/T_sget_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "I"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sget/d/T_sget_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sget_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 391 (0x000187)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 87 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget.d.T_sget_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget.d.T_sget_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: sget v1, Ldot/junit/opcodes/sget/d/T_sget_4;.i1:I // field@0000
-//@mod 60 01 00 00
- 60 01 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 307, len 37: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sget/d/T_sget_4;"
- 23 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 2F 64 2F 54 5F 73 67 65 74 5F 34 3B 00
-// parsed: offset 344, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 364, len 15: TYPE_STRING_DATA_ITEM [4] "T_sget_4.java"
- 0D 54 5F 73 67 65 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 379, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 382, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 386, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget/d/T_sget_4;"
- // parsed: offset 391, len 1: static_fields_size: 1
- 01
- // parsed: offset 392, len 1: instance_fields_size: 0
- 00
- // parsed: offset 393, len 1: direct_methods_size: 1
- 01
- // parsed: offset 394, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 395, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 396, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 397, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 398, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 401, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 403, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 404, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 405, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 407, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 408, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 412, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 424, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 436, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 448, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 460, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 472, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 484, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 496, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 508, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 520, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 391 (0x000187)
- 00 20 00 00 01 00 00 00 87 01 00 00
- // parsed: offset 532, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 408 (0x000198)
- 00 10 00 00 01 00 00 00 98 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_5.d
deleted file mode 100644
index 544f350..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_5.java
-.class public dot.junit.opcodes.sget.d.T_sget_5
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const/4 v2, 5
- iput v2, v3, dot.junit.opcodes.sget.d.T_sget_5.i1 I
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_5.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_5.java
deleted file mode 100644
index 1dac50e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_5 {
-
- public int i1 = 5;
- public int run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_6.d
deleted file mode 100644
index b78b202..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_6.java
-.class public dot.junit.opcodes.sget.d.T_sget_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.TestStubs.TestStubField I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_6.java
deleted file mode 100644
index 8f81780..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_6 {
- public int run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_7.d
deleted file mode 100644
index 7423dcd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_7.java
-.class public dot.junit.opcodes.sget.d.T_sget_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_7no_class.i1 I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_7.java
deleted file mode 100644
index 8960240..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_7 {
- public int run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_8.d
deleted file mode 100644
index 915f609..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_8.java
-.class public dot.junit.opcodes.sget.d.T_sget_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.T_sget_8.i1N I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_8.java
deleted file mode 100644
index 17e16f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_8 {
- public int run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_9.d
deleted file mode 100644
index 831c623..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_9.d
+++ /dev/null
@@ -1,52 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget.d.StubInitError
-.super java/lang/Object
-
-.field public static value I
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput v1, dot.junit.opcodes.sget.d.StubInitError.value I
- return-void
-.end method
-
-
-.source T_sget_9.java
-.class public dot.junit.opcodes.sget.d.T_sget_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- sget v1, dot.junit.opcodes.sget.d.StubInitError.value I
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_9.java
deleted file mode 100644
index 600a586..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget/d/T_sget_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget.d;
-
-public class T_sget_9 {
-
- public int run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/TestStubs.java
deleted file mode 100644
index b353763..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean;
-
-public class TestStubs {
- // used by testVFE4
- private static boolean TestStubField = false;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java
deleted file mode 100644
index ccbeb09..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_11;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_12;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_13;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_5;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_6;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_7;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_8;
-import dot.junit.opcodes.sget_boolean.d.T_sget_boolean_9;
-
-public class Test_sget_boolean extends DxTestCase {
-
- /**
- * @title get boolean from static field
- */
- public void testN1() {
- T_sget_boolean_1 t = new T_sget_boolean_1();
- assertEquals(true, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_11
- T_sget_boolean_11 t = new T_sget_boolean_11();
- assertEquals(true, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
-
- T_sget_boolean_5 t = new T_sget_boolean_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sget_boolean_9 t = new T_sget_boolean_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read boolean from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_boolean_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_6
- //@uses dot.junit.opcodes.sget_boolean.TestStubs
- try {
- new T_sget_boolean_6().run();
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_boolean_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_boolean_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_12
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1
- try {
- new T_sget_boolean_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget_boolean shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_boolean shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_boolean shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_boolean shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_boolean shall not work for byte fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_boolean shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_boolean shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.d
deleted file mode 100644
index 1910152..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_1.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1
-.super java/lang/Object
-
-.field public static i1 Z
-.field protected static p1 Z
-.field private static pvt1 Z
-
-.method static <clinit>()V
-.limit regs 1
- const/4 v0, 1
- sput-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1.i1 Z
-
- const/16 v0, 1
- sput-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1.p1 Z
-
- const/16 v0, 1
- sput-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1.pvt1 Z
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.java
deleted file mode 100644
index 00604c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_1 {
- public static boolean i1 = true;
- protected static boolean p1 = true;
- private static boolean pvt1 = true;
-
- public boolean run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.d
deleted file mode 100644
index a37791b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_11.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_11
-.super dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1.p1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.java
deleted file mode 100644
index 46e332b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_11 extends T_sget_boolean_1 {
-
- public boolean run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.d
deleted file mode 100644
index a6d38b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_12.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_12
-.super dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1.pvt1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.java
deleted file mode 100644
index 74566c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_12 {
- public boolean run(){
- return true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.d
deleted file mode 100644
index f183859..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_13.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_13
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_13.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.java
deleted file mode 100644
index f69d590..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_14.d
deleted file mode 100644
index 90de215..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_14.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_14
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_15.d
deleted file mode 100644
index e09d93c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_15.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_15
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_16.d
deleted file mode 100644
index f6c3529..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_16.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_16
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_17.d
deleted file mode 100644
index 25cadc8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_17.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_17
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_18.d
deleted file mode 100644
index 871ff9b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_18.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_18
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_18.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_19.d
deleted file mode 100644
index 1f4f9e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_19.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_19
-.super java/lang/Object
-
-.field public static i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_20.d
deleted file mode 100644
index 79d51ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_20.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_20
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v0, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_3.d
deleted file mode 100644
index c3271ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_3.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_3
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-boolean v3, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_3.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.d
deleted file mode 100644
index 2ef169f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_4.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.dfh
deleted file mode 100644
index 2c1995e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 70504938
- 38 49 50 70
-// parsed: offset 12, len 20: signature : 1b7b...73d9
- 1B 7B 48 9B 96 83 AB B3 90 67 E9 49 E2 EF 20 98 90 CD 73 D9
-// parsed: offset 32, len 4: file_size : 568
- 38 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 432 (0x0001b0)
- B0 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "Ljava/lang/Object;"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 377 (0x000179) "T_sget_boolean_4.java"
- 79 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 400 (0x000190) "V"
- 90 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 403 (0x000193) "Z"
- 93 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 406 (0x000196) "i1"
- 96 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 410 (0x00019a) "run"
- 9A 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "Z"
-// return_type_idx: 3 (0x000003) "Z"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) type_idx: 3 (0x000003) name_idx: 6 (0x000006) "i1"
- 00 00 03 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 7 (0x000007) "run"
- 00 00 01 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_sget_boolean_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 415 (0x00019f)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 9F 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;.i1:Z // field@0000
-//@mod 63 01 00 00
- 63 01 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 53: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 5F 62 6F 6F 6C 65 61 6E 2F 64 2F 54 5F 73 67 65 74 5F 62 6F 6F 6C 65 61 6E 5F 34 3B 00
-// parsed: offset 357, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 377, len 23: TYPE_STRING_DATA_ITEM [3] "T_sget_boolean_4.java"
- 15 54 5F 73 67 65 74 5F 62 6F 6F 6C 65 61 6E 5F 34 2E 6A 61 76 61 00
-// parsed: offset 400, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 403, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 406, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 410, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;"
- // parsed: offset 415, len 1: static_fields_size: 1
- 01
- // parsed: offset 416, len 1: instance_fields_size: 0
- 00
- // parsed: offset 417, len 1: direct_methods_size: 1
- 01
- // parsed: offset 418, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 419, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 420, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 421, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 422, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 425, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 427, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 428, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 429, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 431, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 432, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 436, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 448, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 460, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 472, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 484, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 496, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 508, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 520, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 532, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 544, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 415 (0x00019f)
- 00 20 00 00 01 00 00 00 9F 01 00 00
- // parsed: offset 556, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 432 (0x0001b0)
- 00 10 00 00 01 00 00 00 B0 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.d
deleted file mode 100644
index 8edf874..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_5.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_5
-.super java/lang/Object
-
-.field public i1 Z
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const/4 v2, 1
- iput-boolean v2, v3, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_5.i1 Z
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_5.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.java
deleted file mode 100644
index e8c679a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_5 {
-
- public boolean i1 = false;
- public boolean run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.d
deleted file mode 100644
index 2bd59dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_6.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.TestStubs.TestStubField Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.java
deleted file mode 100644
index ecf8943..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_6 {
- public boolean run(){
- return true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.d
deleted file mode 100644
index 32ef38f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_7.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_7no_class.i1 Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.java
deleted file mode 100644
index 4db0e16..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_7 {
- public boolean run(){
- return true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.d
deleted file mode 100644
index 04c780c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_boolean_8.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.T_sget_boolean_8.i1N Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.java
deleted file mode 100644
index 42cf804..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_8 {
- public boolean run(){
- return true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_9.d
deleted file mode 100644
index 0cf9a87..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_9.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget_boolean.d.StubInitError
-.super java/lang/Object
-
-.field public static value Z
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 1
- div-int/2addr v1, v0
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sget_boolean.d.StubInitError.value Z
- return-void
-.end method
-
-
-.source T_sget_boolean_9.java
-.class public dot.junit.opcodes.sget_boolean.d.T_sget_boolean_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Z
-.limit regs 3
-
- sget-boolean v1, dot.junit.opcodes.sget_boolean.d.StubInitError.value Z
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_9.java
deleted file mode 100644
index 0956174..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_boolean.d;
-
-public class T_sget_boolean_9 {
-
- public boolean run(){
- return false;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/TestStubs.java
deleted file mode 100644
index 3402e8d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte;
-
-public class TestStubs {
- // used by testVFE4
- private static byte TestStubField = 0;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java
deleted file mode 100644
index 9a19f98..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_1;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_11;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_12;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_13;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_5;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_6;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_7;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_8;
-import dot.junit.opcodes.sget_byte.d.T_sget_byte_9;
-
-public class Test_sget_byte extends DxTestCase {
-
- /**
- * @title get byte from static field
- */
- public void testN1() {
- T_sget_byte_1 t = new T_sget_byte_1();
- assertEquals(77, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_1
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_11
- T_sget_byte_11 t = new T_sget_byte_11();
- assertEquals(77, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
-
- T_sget_byte_5 t = new T_sget_byte_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sget_byte_9 t = new T_sget_byte_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read byte from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_byte_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_6
- //@uses dot.junit.opcodes.sget_byte.TestStubs
- try {
- new T_sget_byte_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_byte_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_byte_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_12
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_1
- try {
- new T_sget_byte_12().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget_byte shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_byte shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_byte shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_byte shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_byte shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_byte shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_byte shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.d
deleted file mode 100644
index 314c2b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_1.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_1
-.super java/lang/Object
-
-.field public static i1 B
-.field protected static p1 B
-.field private static pvt1 B
-
-.method static <clinit>()V
-.limit regs 1
- const v0, 77
- sput-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_1.i1 B
-
- const v0, 77
- sput-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_1.p1 B
-
- const v0, 77
- sput-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_1.pvt1 B
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_1.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.java
deleted file mode 100644
index e1918b9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_1 {
- public static byte i1 = 77;
- protected static byte p1 = 77;
- private static byte pvt1 = 77;
-
- public byte run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.d
deleted file mode 100644
index 2c6fb91..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_11.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_11
-.super dot/junit/opcodes/sget_byte/d/T_sget_byte_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_byte/d/T_sget_byte_1/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_1.p1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.java
deleted file mode 100644
index bf69487..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_11 extends T_sget_byte_1 {
-
- public byte run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.d
deleted file mode 100644
index f2be588..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_12.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_12
-.super dot/junit/opcodes/sget_byte/d/T_sget_byte_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_byte/d/T_sget_byte_1/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_1.pvt1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.java
deleted file mode 100644
index cbfb2c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_12 {
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.d
deleted file mode 100644
index 8da3d7a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_13.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_13
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_13.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.java
deleted file mode 100644
index b2723ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_14.d
deleted file mode 100644
index d64eedc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_14.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_14
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_15.d
deleted file mode 100644
index 7c02a3b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_15.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_15
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_16.d
deleted file mode 100644
index 09e1280..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_16.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_16
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_17.d
deleted file mode 100644
index 41d95fb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_17.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_17
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_18.d
deleted file mode 100644
index e95a5eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_18.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_18
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_19.d
deleted file mode 100644
index 822c286..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_19.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_19
-.super java/lang/Object
-
-.field public static i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_20.d
deleted file mode 100644
index e9c6567..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_20.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_20
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v0, dot.junit.opcodes.sget_byte.d.T_sget_byte_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_3.d
deleted file mode 100644
index 800e5f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_3.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_3
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-byte v3, dot.junit.opcodes.sget_byte.d.T_sget_byte_3.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.d
deleted file mode 100644
index 5e884e3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_4.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_4
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_4.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.dfh
deleted file mode 100644
index c17b068..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c4b64202
- 02 42 B6 C4
-// parsed: offset 12, len 20: signature : e618...6c74
- E6 18 01 1F 28 B9 CC 8D 4C FC 81 38 DA 39 48 BB 16 05 6C 74
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "B"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_sget_byte_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "i1"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "run"
- 91 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "B"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "B"
-// return_type_idx: 0 (0x000000) "B"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sget_byte_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 406 (0x000196)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 96 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget_byte.d.T_sget_byte_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget_byte.d.T_sget_byte_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;.i1:B // field@0000
-//@mod 64 01 00 00
- 64 01 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "B"
- 01 42 00
-// parsed: offset 307, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 5F 62 79 74 65 2F 64 2F 54 5F 73 67 65 74 5F 62 79 74 65 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 20: TYPE_STRING_DATA_ITEM [4] "T_sget_byte_4.java"
- 12 54 5F 73 67 65 74 5F 62 79 74 65 5F 34 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 401, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;"
- // parsed: offset 406, len 1: static_fields_size: 1
- 01
- // parsed: offset 407, len 1: instance_fields_size: 0
- 00
- // parsed: offset 408, len 1: direct_methods_size: 1
- 01
- // parsed: offset 409, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 410, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 411, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 412, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 413, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 416, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 419, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 420, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 422, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 406 (0x000196)
- 00 20 00 00 01 00 00 00 96 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.d
deleted file mode 100644
index ad5d006..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_5.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_5
-.super java/lang/Object
-
-.field public i1 B
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const v2, 77
- iput-byte v2, v3, dot.junit.opcodes.sget_byte.d.T_sget_byte_5.i1 B
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_5.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.java
deleted file mode 100644
index 4391486..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_5 {
-
- public byte i1 = 77;
- public byte run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.d
deleted file mode 100644
index 48a4cb8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_6.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.TestStubs.TestStubField B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.java
deleted file mode 100644
index df4e3f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_6 {
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.d
deleted file mode 100644
index e887bec..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_7.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_7no_class.i1 B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.java
deleted file mode 100644
index b865dde..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_7 {
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.d
deleted file mode 100644
index 96ab1da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_byte_8.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.T_sget_byte_8.i1N B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.java
deleted file mode 100644
index 605616f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_8 {
- public byte run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_9.d
deleted file mode 100644
index aee1a37..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_9.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget_byte.d.StubInitError
-.super java/lang/Object
-
-.field public static value B
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 1
- div-int/2addr v1, v0
-
- const v1, 1
- sput-byte v1, dot.junit.opcodes.sget_byte.d.StubInitError.value B
- return-void
-.end method
-
-
-.source T_sget_byte_9.java
-.class public dot.junit.opcodes.sget_byte.d.T_sget_byte_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()B
-.limit regs 3
-
- sget-byte v1, dot.junit.opcodes.sget_byte.d.StubInitError.value B
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_9.java
deleted file mode 100644
index 3bd966d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_byte.d;
-
-public class T_sget_byte_9 {
-
- public byte run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/TestStubs.java
deleted file mode 100644
index dc99b6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char;
-
-public class TestStubs {
- // used by testVFE4
- private static char TestStubField = 0;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/Test_sget_char.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/Test_sget_char.java
deleted file mode 100644
index 10324a5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/Test_sget_char.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget_char.d.T_sget_char_1;
-import dot.junit.opcodes.sget_char.d.T_sget_char_11;
-import dot.junit.opcodes.sget_char.d.T_sget_char_12;
-import dot.junit.opcodes.sget_char.d.T_sget_char_13;
-import dot.junit.opcodes.sget_char.d.T_sget_char_5;
-import dot.junit.opcodes.sget_char.d.T_sget_char_6;
-import dot.junit.opcodes.sget_char.d.T_sget_char_7;
-import dot.junit.opcodes.sget_char.d.T_sget_char_8;
-import dot.junit.opcodes.sget_char.d.T_sget_char_9;
-
-public class Test_sget_char extends DxTestCase {
-
- /**
- * @title get char from static field
- */
- public void testN1() {
- T_sget_char_1 t = new T_sget_char_1();
- assertEquals(77, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_1
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_11
- T_sget_char_11 t = new T_sget_char_11();
- assertEquals(77, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
-
- T_sget_char_5 t = new T_sget_char_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sget_char_9 t = new T_sget_char_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read char from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_char_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_6
- //@uses dot.junit.opcodes.sget_char.TestStubs
- try {
- new T_sget_char_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_char_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_char_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_12
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_1
- try {
- new T_sget_char_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget_char shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_char shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_char shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_char shall not work for byte fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_char shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_char shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_char shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.d
deleted file mode 100644
index 5fc252d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_1.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_1
-.super java/lang/Object
-
-.field public static i1 C
-.field protected static p1 C
-.field private static pvt1 C
-
-.method static <clinit>()V
-.limit regs 1
- const v0, 77
- sput-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_1.i1 C
-
- const v0, 77
- sput-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_1.p1 C
-
- const v0, 77
- sput-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_1.pvt1 C
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_1.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.java
deleted file mode 100644
index 3a606be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_1 {
- public static char i1 = 77;
- protected static char p1 = 77;
- private static char pvt1 = 77;
-
- public char run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.d
deleted file mode 100644
index d4d3efb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_11.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_11
-.super dot/junit/opcodes/sget_char/d/T_sget_char_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_char/d/T_sget_char_1/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_1.p1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.java
deleted file mode 100644
index fd73e27..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_11 extends T_sget_char_1 {
-
- public char run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.d
deleted file mode 100644
index 708f2db..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_12.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_12
-.super dot/junit/opcodes/sget_char/d/T_sget_char_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_char/d/T_sget_char_1/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_1.pvt1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.java
deleted file mode 100644
index f7affdf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_12 {
- public char run() {
- return ' ';
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.d
deleted file mode 100644
index eb652bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_13.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_13
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_13.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.java
deleted file mode 100644
index b347b53..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_14.d
deleted file mode 100644
index c1b8040..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_14.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_14
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_15.d
deleted file mode 100644
index dedb8e2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_15.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_15
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_16.d
deleted file mode 100644
index 82a5544..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_16.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_16
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_17.d
deleted file mode 100644
index abff0e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_17.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_17
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_17.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_18.d
deleted file mode 100644
index b73a284..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_18.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_18
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_19.d
deleted file mode 100644
index 437c0bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_19.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_19
-.super java/lang/Object
-
-.field public static i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_20.d
deleted file mode 100644
index eeaff5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_20.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_20
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v0, dot.junit.opcodes.sget_char.d.T_sget_char_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_3.d
deleted file mode 100644
index 3c6e95d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_3.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_3
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-char v3, dot.junit.opcodes.sget_char.d.T_sget_char_3.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.d
deleted file mode 100644
index 9aeb10d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_4.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_4
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_4.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.dfh
deleted file mode 100644
index 42e44bf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_char/d/T_sget_char_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_char/d/T_sget_char_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 15a34188
- 88 41 A3 15
-// parsed: offset 12, len 20: signature : 7979...9945
- 79 79 0B 7C 86 0C D4 6D A0 83 40 1C 4E AF AA 03 59 84 99 45
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "C"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/sget_char/d/T_sget_char_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_sget_char_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "i1"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "run"
- 91 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "C"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sget_char/d/T_sget_char_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "C"
-// return_type_idx: 0 (0x000000) "C"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sget_char/d/T_sget_char_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sget_char_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 406 (0x000196)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 96 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget_char.d.T_sget_char_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget_char.d.T_sget_char_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_4;.i1:C // field@0000
-//@mod 65 01 00 00
- 65 01 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "C"
- 01 43 00
-// parsed: offset 307, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sget_char/d/T_sget_char_4;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 5F 63 68 61 72 2F 64 2F 54 5F 73 67 65 74 5F 63 68 61 72 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 20: TYPE_STRING_DATA_ITEM [4] "T_sget_char_4.java"
- 12 54 5F 73 67 65 74 5F 63 68 61 72 5F 34 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 401, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget_char/d/T_sget_char_4;"
- // parsed: offset 406, len 1: static_fields_size: 1
- 01
- // parsed: offset 407, len 1: instance_fields_size: 0
- 00
- // parsed: offset 408, len 1: direct_methods_size: 1
- 01
- // parsed: offset 409, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 410, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 411, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 412, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 413, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 416, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 419, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 420, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 422, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 406 (0x000196)
- 00 20 00 00 01 00 00 00 96 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.d
deleted file mode 100644
index fe1c7ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_5.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_5
-.super java/lang/Object
-
-.field public i1 C
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const v2, 77
- iput-char v2, v3, dot.junit.opcodes.sget_char.d.T_sget_char_5.i1 C
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_5.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.java
deleted file mode 100644
index 00fb8ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_5 {
-
- public char i1 = 77;
- public char run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.d
deleted file mode 100644
index f984ada..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_6.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.TestStubs.TestStubField C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.java
deleted file mode 100644
index 7fc0f38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_6 {
- public char run() {
- return ' ';
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.d
deleted file mode 100644
index d7b5e35..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_7.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_7no_class.i1 C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.java
deleted file mode 100644
index 616d9f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_7 {
- public char run() {
- return ' ';
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.d
deleted file mode 100644
index 89ac2c8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_char_8.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.T_sget_char_8.i1N C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.java
deleted file mode 100644
index 78e63e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_8 {
- public char run() {
- return ' ';
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_9.d
deleted file mode 100644
index cbb4a54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_9.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget_char.d.StubInitError
-.super java/lang/Object
-
-.field public static value C
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 1
- div-int/2addr v1, v0
-
- const v1, 1
- sput-char v1, dot.junit.opcodes.sget_char.d.StubInitError.value C
- return-void
-.end method
-
-
-.source T_sget_char_9.java
-.class public dot.junit.opcodes.sget_char.d.T_sget_char_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()C
-.limit regs 3
-
- sget-char v1, dot.junit.opcodes.sget_char.d.StubInitError.value C
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_9.java
deleted file mode 100644
index bc84d1e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_char/d/T_sget_char_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_char.d;
-
-public class T_sget_char_9 {
-
- public char run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/TestStubs.java
deleted file mode 100644
index 68b9ec7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object;
-
-public class TestStubs {
- // used by testVFE4
- private static Object TestStubField = null;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/Test_sget_object.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/Test_sget_object.java
deleted file mode 100644
index 88aa4cb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/Test_sget_object.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget_object.d.T_sget_object_1;
-import dot.junit.opcodes.sget_object.d.T_sget_object_11;
-import dot.junit.opcodes.sget_object.d.T_sget_object_12;
-import dot.junit.opcodes.sget_object.d.T_sget_object_13;
-import dot.junit.opcodes.sget_object.d.T_sget_object_21;
-import dot.junit.opcodes.sget_object.d.T_sget_object_5;
-import dot.junit.opcodes.sget_object.d.T_sget_object_6;
-import dot.junit.opcodes.sget_object.d.T_sget_object_7;
-import dot.junit.opcodes.sget_object.d.T_sget_object_8;
-import dot.junit.opcodes.sget_object.d.T_sget_object_9;
-
-public class Test_sget_object extends DxTestCase {
-
- /**
- * @title get object from static field
- */
- public void testN1() {
- T_sget_object_1 t = new T_sget_object_1();
- assertEquals(null, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_1
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_11
- T_sget_object_11 t = new T_sget_object_11();
- assertEquals(null, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
-
- T_sget_object_5 t = new T_sget_object_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sget_object_9 t = new T_sget_object_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read object from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_object_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_6
- //@uses dot.junit.opcodes.sget_object.TestStubs
- try {
- new T_sget_object_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_object_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_object_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_12
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_1
- try {
- new T_sget_object_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget_object shall not work for short fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_object shall not work for char fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_object shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_object shall not work for byte fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_object shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_object shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_object shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title only field of different type exists)
- */
- public void testVFE15() {
- try {
- new T_sget_object_21().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_1.d
deleted file mode 100644
index e77f532..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_1.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_1
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-.field protected static p1 Ljava/lang/Object;
-.field private static pvt1 Ljava/lang/Object;
-
-.method static <clinit>()V
-.limit regs 1
- const v0, 0
- sput-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_1.i1 Ljava/lang/Object;
-
- const v0, 0
- sput-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_1.p1 Ljava/lang/Object;
-
- const v0, 0
- sput-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_1.pvt1 Ljava/lang/Object;
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_1.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_1.java
deleted file mode 100644
index bcfe83b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_1 {
- public static Object i1 = null;
- protected static Object p1 = null;
- private static Object pvt1 = null;
-
- public Object run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.d
deleted file mode 100644
index 54e497c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_11.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_11
-.super dot/junit/opcodes/sget_object/d/T_sget_object_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_object/d/T_sget_object_1/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_1.p1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.java
deleted file mode 100644
index 9b8ce6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_11 extends T_sget_object_1 {
-
- public Object run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.d
deleted file mode 100644
index b73c407..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_12.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_12
-.super dot/junit/opcodes/sget_object/d/T_sget_object_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_object/d/T_sget_object_1/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_1.pvt1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.java
deleted file mode 100644
index 0978a26..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_12 {
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.d
deleted file mode 100644
index 37a8cb5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_13.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_13
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_13.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.java
deleted file mode 100644
index 7fe275e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_14.d
deleted file mode 100644
index 1455ebd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_14.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_14
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_14.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_15.d
deleted file mode 100644
index 0634476..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_15.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_15
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_15.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_16.d
deleted file mode 100644
index 42db7a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_16.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_16
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_17.d
deleted file mode 100644
index 0a3ba48..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_17.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_17
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_17.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_18.d
deleted file mode 100644
index ca498f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_18.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_18
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_19.d
deleted file mode 100644
index dfcad9b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_19.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_19
-.super java/lang/Object
-
-.field public static i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_20.d
deleted file mode 100644
index 89e7bfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_20.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_20
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_21.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_21.d
deleted file mode 100644
index ddb0713..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_21.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_21.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_21
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method static <clinit>()V
-.limit regs 1
- new-instance v0, java/lang/Object
- invoke-direct {v0}, java/lang/Object/<init>()V
-
- sput-object v0, dot.junit.opcodes.sget_object.d.T_sget_object_21.i1 Ljava/lang/Object;
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/String;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_21.i1 Ljava/lang/String;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_21.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_21.java
deleted file mode 100644
index 0343390..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_21.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_21 {
- public String run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_3.d
deleted file mode 100644
index 498a01a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_3.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_3
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-object v3, dot.junit.opcodes.sget_object.d.T_sget_object_3.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_4.d
deleted file mode 100644
index d00c4a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_4.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_4
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_4.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_4.dfh
deleted file mode 100644
index 1c40c8c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_4.dfh
+++ /dev/null
@@ -1,262 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_object/d/T_sget_object_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_object/d/T_sget_object_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : a1514422
- 22 44 51 A1
-// parsed: offset 12, len 20: signature : b308...2562
- B3 08 01 4F 75 89 6C 79 7C 97 5C 84 37 60 65 F6 AF 62 25 62
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 156 (0x00009c)
- 9C 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 188 (0x0000bc)
- BC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 212 (0x0000d4)
- D4 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 244 (0x0000f4)
- F4 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 292 (0x000124) "<init>"
- 24 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 300 (0x00012c) "L"
- 2C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 303 (0x00012f) "Ldot/junit/opcodes/sget_object/d/T_sget_object_4;"
- 2F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_sget_object_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 396 (0x00018c) "V"
- 8C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 399 (0x00018f) "i1"
- 8F 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "run"
- 93 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sget_object/d/T_sget_object_4;"
- 02 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 156, len 12: [0]
-// shorty_idx: 1 (0x000001) "L"
-// return_type_idx: 1 (0x000001) "Ljava/lang/Object;"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 00 00 00 00
-// parsed: offset 168, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 180, len 8: [0] class_idx: 0 (0x000000) type_idx: 1 (0x000001) name_idx: 6 (0x000006) "i1"
- 00 00 01 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 188, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 196, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 204, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 212, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/sget_object/d/T_sget_object_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sget_object_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 408 (0x000198)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 98 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget_object.d.T_sget_object_4.<init>"
- // parsed: offset 244, len 2: registers_size: 1
- 01 00
- // parsed: offset 246, len 2: ins_size: 1
- 01 00
- // parsed: offset 248, len 2: outs_size: 1
- 01 00
- // parsed: offset 250, len 2: tries_size: 0
- 00 00
- // parsed: offset 252, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 256, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 260, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 266, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget_object.d.T_sget_object_4.run"
- // parsed: offset 268, len 2: registers_size: 3
- 03 00
- // parsed: offset 270, len 2: ins_size: 1
- 01 00
- // parsed: offset 272, len 2: outs_size: 0
- 00 00
- // parsed: offset 274, len 2: tries_size: 0
- 00 00
- // parsed: offset 276, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 280, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 284, len 4: |0000: sget-object v1, Ldot/junit/opcodes/sget_object/d/T_sget_object_4;.i1:Ljava/lang/Object; // field@0000
-//@mod 62 01 00 00
- 62 01 00 01
- // parsed: offset 288, len 2: |0002: return-object v1
- 11 01
- // tries:
- // handlers:
-// parsed: offset 290, len 2: PADDING
- 00 00
-// parsed: offset 292, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 300, len 3: TYPE_STRING_DATA_ITEM [1] "L"
- 01 4C 00
-// parsed: offset 303, len 51: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sget_object/d/T_sget_object_4;"
- 31 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 5F 6F 62 6A 65 63 74 2F 64 2F 54 5F 73 67 65 74 5F 6F 62 6A 65 63 74 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 22: TYPE_STRING_DATA_ITEM [4] "T_sget_object_4.java"
- 14 54 5F 73 67 65 74 5F 6F 62 6A 65 63 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 396, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 399, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 403, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget_object/d/T_sget_object_4;"
- // parsed: offset 408, len 1: static_fields_size: 1
- 01
- // parsed: offset 409, len 1: instance_fields_size: 0
- 00
- // parsed: offset 410, len 1: direct_methods_size: 1
- 01
- // parsed: offset 411, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 412, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 413, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 414, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 415, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 418, len 2: code_off: 244 (0x0000f4)
- F4 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 420, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 421, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 422, len 2: code_off: 268 (0x00010c)
- 8C 02
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 144 (0x000090)
- 02 00 00 00 03 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 156 (0x00009c)
- 03 00 00 00 02 00 00 00 9C 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 180 (0x0000b4)
- 04 00 00 00 01 00 00 00 B4 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 188 (0x0000bc)
- 05 00 00 00 03 00 00 00 BC 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 212 (0x0000d4)
- 06 00 00 00 01 00 00 00 D4 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 244 (0x0000f4)
- 01 20 00 00 02 00 00 00 F4 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 292 (0x000124)
- 02 20 00 00 08 00 00 00 24 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 408 (0x000198)
- 00 20 00 00 01 00 00 00 98 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_5.d
deleted file mode 100644
index 35687ab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_5.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_5
-.super java/lang/Object
-
-.field public i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const v2, 0
- iput-object v2, v3, dot.junit.opcodes.sget_object.d.T_sget_object_5.i1 Ljava/lang/Object;
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_5.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_5.java
deleted file mode 100644
index 116ae52..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_5 {
-
- public Object i1 = null;
- public Object run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.d
deleted file mode 100644
index 03483da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_6.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.TestStubs.TestStubField Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.java
deleted file mode 100644
index 84714b2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_6 {
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.d
deleted file mode 100644
index eb172eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_7.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_7no_class.i1 Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.java
deleted file mode 100644
index 56fbd35..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_7 {
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.d
deleted file mode 100644
index 841a454..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_object_8.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.T_sget_object_8.i1N Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.java
deleted file mode 100644
index 87afe69..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_8 {
- public Object run() {
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_9.d
deleted file mode 100644
index efd184b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_9.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget_object.d.StubInitError
-.super java/lang/Object
-
-.field public static value Ljava/lang/Object;
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 1
- div-int/2addr v1, v0
-
- const v1, 0
- sput-object v1, dot.junit.opcodes.sget_object.d.StubInitError.value Ljava/lang/Object;
- return-void
-.end method
-
-
-.source T_sget_object_9.java
-.class public dot.junit.opcodes.sget_object.d.T_sget_object_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()Ljava/lang/Object;
-.limit regs 3
-
- sget-object v1, dot.junit.opcodes.sget_object.d.StubInitError.value Ljava/lang/Object;
- return-object v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_9.java
deleted file mode 100644
index 4fbae55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_object/d/T_sget_object_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_object.d;
-
-public class T_sget_object_9 {
-
- public Object run(){
- return null;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/TestStubs.java
deleted file mode 100644
index 3e5605b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short;
-
-public class TestStubs {
- // used by testVFE4
- private static short TestStubField = 0;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/Test_sget_short.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/Test_sget_short.java
deleted file mode 100644
index b38ef29..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/Test_sget_short.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget_short.d.T_sget_short_1;
-import dot.junit.opcodes.sget_short.d.T_sget_short_11;
-import dot.junit.opcodes.sget_short.d.T_sget_short_12;
-import dot.junit.opcodes.sget_short.d.T_sget_short_13;
-import dot.junit.opcodes.sget_short.d.T_sget_short_5;
-import dot.junit.opcodes.sget_short.d.T_sget_short_6;
-import dot.junit.opcodes.sget_short.d.T_sget_short_7;
-import dot.junit.opcodes.sget_short.d.T_sget_short_8;
-import dot.junit.opcodes.sget_short.d.T_sget_short_9;
-
-public class Test_sget_short extends DxTestCase {
-
- /**
- * @title get short from static field
- */
- public void testN1() {
- T_sget_short_1 t = new T_sget_short_1();
- assertEquals(32000, t.run());
- }
-
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_1
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_11
- T_sget_short_11 t = new T_sget_short_11();
- assertEquals(32000, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
-
- T_sget_short_5 t = new T_sget_short_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sget_short_9 t = new T_sget_short_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read short from long field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_short_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_6
- //@uses dot.junit.opcodes.sget_short.TestStubs
- try {
- new T_sget_short_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_short_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_short_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_12
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_1
- try {
- new T_sget_short_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget_short shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_short shall not work for char fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_short shall not work for int fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_short shall not work for byte fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_short shall not work for boolean fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_short shall not work for double fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget_short shall not work for long fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.d
deleted file mode 100644
index 777253e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_1.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_1
-.super java/lang/Object
-
-.field public static i1 S
-.field protected static p1 S
-.field private static pvt1 S
-
-.method static <clinit>()V
-.limit regs 1
- const v0, 32000
- sput-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_1.i1 S
-
- const v0, 32000
- sput-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_1.p1 S
-
- const v0, 32000
- sput-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_1.pvt1 S
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_1.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.java
deleted file mode 100644
index 5cb80f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_1 {
- public static short i1 = 32000;
- protected static short p1 = 32000;
- private static short pvt1 = 32000;
-
- public short run(){
- return i1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.d
deleted file mode 100644
index d0f87a4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_11.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_11
-.super dot/junit/opcodes/sget_short/d/T_sget_short_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_short/d/T_sget_short_1/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_1.p1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.java
deleted file mode 100644
index 790a0de..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_11 extends T_sget_short_1 {
-
- public short run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.d
deleted file mode 100644
index 7a0a307..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_12.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_12
-.super dot/junit/opcodes/sget_short/d/T_sget_short_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_short/d/T_sget_short_1/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_1.pvt1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.java
deleted file mode 100644
index ea41518..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_12 {
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.d
deleted file mode 100644
index b37df82..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_13.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_13
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_13.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.java
deleted file mode 100644
index 4bc3105..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_13 {
- public void run(){
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_14.d
deleted file mode 100644
index 3d79cd1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_14.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_14
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_15.d
deleted file mode 100644
index d8751e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_15.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_15
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_15.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_16.d
deleted file mode 100644
index 48f416c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_16.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_16
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_16.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_17.d
deleted file mode 100644
index 1cc7398..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_17.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_17
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_17.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_18.d
deleted file mode 100644
index 7f3ff6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_18.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_18
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_18.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_19.d
deleted file mode 100644
index b9841ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_19.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_19
-.super java/lang/Object
-
-.field public static i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_19.i1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_20.d
deleted file mode 100644
index 1ae3803..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_20.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_20
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v0, dot.junit.opcodes.sget_short.d.T_sget_short_20.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_3.d
deleted file mode 100644
index 9dcbd24..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_3.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_3
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-short v3, dot.junit.opcodes.sget_short.d.T_sget_short_3.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.d
deleted file mode 100644
index ab070e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_4.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_4
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_4.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.dfh
deleted file mode 100644
index c19a74a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_short/d/T_sget_short_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_short/d/T_sget_short_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 4d504536
- 36 45 50 4D
-// parsed: offset 12, len 20: signature : d415...9794
- D4 15 7B CD 4D D8 21 C3 FF 53 0E DE B1 2F 9E 3D 0D 47 97 94
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "Ldot/junit/opcodes/sget_short/d/T_sget_short_4;"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 353 (0x000161) "Ljava/lang/Object;"
- 61 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 373 (0x000175) "S"
- 75 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 376 (0x000178) "T_sget_short_4.java"
- 78 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 397 (0x00018d) "V"
- 8D 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 400 (0x000190) "i1"
- 90 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 404 (0x000194) "run"
- 94 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/sget_short/d/T_sget_short_4;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "S"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 3 (0x000003) "S"
-// return_type_idx: 2 (0x000002) "S"
-// parameters_off: 0 (0x000000)
- 03 00 00 00 02 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 0 (0x000000) type_idx: 2 (0x000002) name_idx: 6 (0x000006) "i1"
- 00 00 02 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 0 (0x000000) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 00 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 00 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/sget_short/d/T_sget_short_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sget_short_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 409 (0x000199)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 99 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget_short.d.T_sget_short_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget_short.d.T_sget_short_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_4;.i1:S // field@0000
-//@mod 66 01 00 00
- 66 01 00 01
- // parsed: offset 292, len 2: |0002: return v1
- 0F 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 49: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/sget_short/d/T_sget_short_4;"
- 2F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 5F 73 68 6F 72 74 2F 64 2F 54 5F 73 67 65 74 5F 73 68 6F 72 74 5F 34 3B 00
-// parsed: offset 353, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 373, len 3: TYPE_STRING_DATA_ITEM [3] "S"
- 01 53 00
-// parsed: offset 376, len 21: TYPE_STRING_DATA_ITEM [4] "T_sget_short_4.java"
- 13 54 5F 73 67 65 74 5F 73 68 6F 72 74 5F 34 2E 6A 61 76 61 00
-// parsed: offset 397, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 400, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 404, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget_short/d/T_sget_short_4;"
- // parsed: offset 409, len 1: static_fields_size: 1
- 01
- // parsed: offset 410, len 1: instance_fields_size: 0
- 00
- // parsed: offset 411, len 1: direct_methods_size: 1
- 01
- // parsed: offset 412, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 413, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 414, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 415, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 416, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 419, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 421, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 422, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 423, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 425, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 409 (0x000199)
- 00 20 00 00 01 00 00 00 99 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.d
deleted file mode 100644
index b7c451a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_5.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_5
-.super java/lang/Object
-
-.field public i1 S
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const v2, 77
- iput-short v2, v3, dot.junit.opcodes.sget_short.d.T_sget_short_5.i1 S
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_5.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.java
deleted file mode 100644
index c1dda0c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_5 {
-
- public short i1 = 32000;
- public short run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.d
deleted file mode 100644
index ce1ec34..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_6.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.TestStubs.TestStubField S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.java
deleted file mode 100644
index 1499a3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_6 {
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.d
deleted file mode 100644
index 2c82957..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_7.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_7no_class.i1 S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.java
deleted file mode 100644
index 823e90d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_7 {
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.d
deleted file mode 100644
index 645aa56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_short_8.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.T_sget_short_8.i1N S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.java
deleted file mode 100644
index 2c3ec32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_8 {
- public short run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_9.d
deleted file mode 100644
index 85d6755..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_9.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget_short.d.StubInitError
-.super java/lang/Object
-
-.field public static value S
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 1
- div-int/2addr v1, v0
-
- const v1, 1
- sput-short v1, dot.junit.opcodes.sget_short.d.StubInitError.value S
- return-void
-.end method
-
-
-.source T_sget_short_9.java
-.class public dot.junit.opcodes.sget_short.d.T_sget_short_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()S
-.limit regs 3
-
- sget-short v1, dot.junit.opcodes.sget_short.d.StubInitError.value S
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_9.java
deleted file mode 100644
index 512ef4c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_short/d/T_sget_short_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_short.d;
-
-public class T_sget_short_9 {
-
- public short run(){
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/TestStubs.java
deleted file mode 100644
index 3538a38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/TestStubs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide;
-
-public class TestStubs {
- // used by testVFE4
- private static long TestStubField = 50;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java
deleted file mode 100644
index 8ecbeb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_1;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_11;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_12;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_13;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_2;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_5;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_6;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_7;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_8;
-import dot.junit.opcodes.sget_wide.d.T_sget_wide_9;
-
-public class Test_sget_wide extends DxTestCase {
-
- /**
- * @title type - long
- */
- public void testN1() {
- T_sget_wide_1 t = new T_sget_wide_1();
- assertEquals(12345679890123l, t.run());
- }
-
- /**
- * @title type - double
- */
- public void testN2() {
- T_sget_wide_2 t = new T_sget_wide_2();
- assertEquals(123.0, t.run());
- }
-
- /**
- * @title access protected field from subclass
- */
- public void testN3() {
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_1
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_11
- T_sget_wide_11 t = new T_sget_wide_11();
- assertEquals(10, t.run());
- }
-
- /**
- * @constraint A12
- * @title attempt to access non-static field
- */
- public void testE1() {
-
- T_sget_wide_5 t = new T_sget_wide_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
-
- T_sget_wide_9 t = new T_sget_wide_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
-
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title read long from integer field - only field with same name but
- * different type exists
- */
- public void testVFE3() {
- try {
- new T_sget_wide_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read inaccessible field.
- */
- public void testVFE4() {
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_6
- //@uses dot.junit.opcodes.sget_wide.TestStubs
- try {
- new T_sget_wide_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read field of undefined class.
- */
- public void testVFE5() {
- try {
- new T_sget_wide_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read undefined field.
- */
- public void testVFE6() {
- try {
- new T_sget_wide_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to read superclass' private field from subclass.
- */
- public void testVFE7() {
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_12
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_1
- try {
- new T_sget_wide_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint B1
- * @title sget-wide shall not work for reference fields
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget-wide shall not work for short fields
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget-wide shall not work for boolean fields
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget-wide shall not work for char fields
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget-wide shall not work for byte fields
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget-wide shall not work for float fields
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sget-wide shall not work for int fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_1.d
deleted file mode 100644
index ffd5cb4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_1.d
+++ /dev/null
@@ -1,51 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_1.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_1
-.super java/lang/Object
-
-.field public static i1 J
-.field protected static p1 J
-.field private static pvt1 J
-
-.method static <clinit>()V
-.limit regs 2
- const-wide v0, 12345679890123
- sput-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_1.i1 J
-
- const-wide v0, 10
- sput-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_1.p1 J
-
- const-wide v0, 20
- sput-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_1.pvt1 J
-
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_1.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_1.java
deleted file mode 100644
index e995709..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_1 {
- public static long i1 = 12345679890123l;
- protected static long p1 = 10;
- private static long pvt1 = 20;
-
- public long run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.d
deleted file mode 100644
index 3485b03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_11.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_11
-.super dot/junit/opcodes/sget_wide/d/T_sget_wide_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_wide/d/T_sget_wide_1/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_1.p1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.java
deleted file mode 100644
index 41f07c7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_11 extends T_sget_wide_1 {
-
- public long run(){
- return p1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.d
deleted file mode 100644
index 36c4678..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_12.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_12
-.super dot/junit/opcodes/sget_wide/d/T_sget_wide_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sget_wide/d/T_sget_wide_1/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_1.pvt1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.java
deleted file mode 100644
index 9dc55c6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_12 {
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.d
deleted file mode 100644
index 308bdd1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_13.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_13
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_13.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.java
deleted file mode 100644
index 21fc969..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_13 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_14.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_14.d
deleted file mode 100644
index 6e32d54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_14.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_14.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_14
-.super java/lang/Object
-
-.field public static i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_14.i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_15.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_15.d
deleted file mode 100644
index 685bf22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_15.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_15.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_15
-.super java/lang/Object
-
-.field public static i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_15.i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_16.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_16.d
deleted file mode 100644
index 5548cdc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_16.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_16.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_16
-.super java/lang/Object
-
-.field public static i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_16.i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_17.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_17.d
deleted file mode 100644
index 961c845..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_17.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_17
-.super java/lang/Object
-
-.field public static i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_17.i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_18.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_18.d
deleted file mode 100644
index 8dba06c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_18.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_18.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_18
-.super java/lang/Object
-
-.field public static i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_18.i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_19.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_19.d
deleted file mode 100644
index e8d5722..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_19.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_19.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_19
-.super java/lang/Object
-
-.field public static i1 F
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_19.i1 F
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.d
deleted file mode 100644
index 4e12946..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_2.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_2
-.super java/lang/Object
-
-.field public static val D
-
-.method static <clinit>()V
-.limit regs 2
- const-wide v0, 123.0
- sput-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_2.val D
- return-void
-.end method
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()D
-.limit regs 4
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_2.val D
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.java
deleted file mode 100644
index ea40542..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_2 {
-
- public static double val = 123.0d;
-
- public double run() {
- return val;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_20.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_20.d
deleted file mode 100644
index 1861a25..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_20.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_20
-.super java/lang/Object
-
-.field public static i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_20.i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_3.d
deleted file mode 100644
index e672291..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_3.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_3
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sget-wide v3, dot.junit.opcodes.sget_wide.d.T_sget_wide_3.i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.d
deleted file mode 100644
index 9924345..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_4.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_4
-.super java/lang/Object
-
-.field public static i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_4.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.dfh b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.dfh
deleted file mode 100644
index aa8661b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.dfh
+++ /dev/null
@@ -1,266 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 7da34431
- 31 44 A3 7D
-// parsed: offset 12, len 20: signature : 3c53...7396
- 3C 53 BF B1 B1 75 57 C6 91 52 F2 94 23 6C C3 BF 3B B4 73 96
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 192 (0x0000c0)
- C0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 216 (0x0000d8)
- D8 00 00 00
-// parsed: offset 104, len 4: data_size : 312
- 38 01 00 00
-// parsed: offset 108, len 4: data_off : 248 (0x0000f8)
- F8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 296 (0x000128) "<init>"
- 28 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 304 (0x000130) "J"
- 30 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 307 (0x000133) "Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;"
- 33 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 354 (0x000162) "Ljava/lang/Object;"
- 62 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 374 (0x000176) "T_sget_wide_4.java"
- 76 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 394 (0x00018a) "V"
- 8A 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 397 (0x00018d) "i1"
- 8D 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 401 (0x000191) "run"
- 91 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "J"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 1 (0x000001) "J"
-// return_type_idx: 0 (0x000000) "J"
-// parameters_off: 0 (0x000000)
- 01 00 00 00 00 00 00 00 00 00 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 6 (0x000006) "i1"
- 01 00 00 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 192, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 200, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 208, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 216, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sget_wide_4.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 406 (0x000196)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 96 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sget_wide.d.T_sget_wide_4.<init>"
- // parsed: offset 248, len 2: registers_size: 1
- 01 00
- // parsed: offset 250, len 2: ins_size: 1
- 01 00
- // parsed: offset 252, len 2: outs_size: 1
- 01 00
- // parsed: offset 254, len 2: tries_size: 0
- 00 00
- // parsed: offset 256, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 260, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 264, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 270, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sget_wide.d.T_sget_wide_4.run"
- // parsed: offset 272, len 2: registers_size: 3
- 03 00
- // parsed: offset 274, len 2: ins_size: 1
- 01 00
- // parsed: offset 276, len 2: outs_size: 0
- 00 00
- // parsed: offset 278, len 2: tries_size: 0
- 00 00
- // parsed: offset 280, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 284, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 288, len 4: |0000: sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;.i1:J // field@0000
-//@mod 61 01 00 00
- 61 01 00 01
- // parsed: offset 292, len 2: |0002: return-wide v1
- 10 01
- // tries:
- // handlers:
-// parsed: offset 294, len 2: PADDING
- 00 00
-// parsed: offset 296, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 304, len 3: TYPE_STRING_DATA_ITEM [1] "J"
- 01 4A 00
-// parsed: offset 307, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 67 65 74 5F 77 69 64 65 2F 64 2F 54 5F 73 67 65 74 5F 77 69 64 65 5F 34 3B 00
-// parsed: offset 354, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 374, len 20: TYPE_STRING_DATA_ITEM [4] "T_sget_wide_4.java"
- 12 54 5F 73 67 65 74 5F 77 69 64 65 5F 34 2E 6A 61 76 61 00
-// parsed: offset 394, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 397, len 4: TYPE_STRING_DATA_ITEM [6] "i1"
- 02 69 31 00
-// parsed: offset 401, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;"
- // parsed: offset 406, len 1: static_fields_size: 1
- 01
- // parsed: offset 407, len 1: instance_fields_size: 0
- 00
- // parsed: offset 408, len 1: direct_methods_size: 1
- 01
- // parsed: offset 409, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 410, len 1: field_idx_diff: 0 (field_idx: 0 "i1")
- 00
- // parsed: offset 411, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 412, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 413, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 416, len 2: code_off: 248 (0x0000f8)
- F8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 418, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 419, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 420, len 2: code_off: 272 (0x000110)
- 90 02
-// parsed: offset 422, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 04 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 192 (0x0000c0)
- 05 00 00 00 03 00 00 00 C0 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 216 (0x0000d8)
- 06 00 00 00 01 00 00 00 D8 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 248 (0x0000f8)
- 01 20 00 00 02 00 00 00 F8 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 296 (0x000128)
- 02 20 00 00 08 00 00 00 28 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 406 (0x000196)
- 00 20 00 00 01 00 00 00 96 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.d
deleted file mode 100644
index e323dc0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_5.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_5
-.super java/lang/Object
-
-.field public i1 J
-
-.method public <init>()V
-.limit regs 4
-
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- const-wide v0, 5
- iput-wide v0, v3, dot.junit.opcodes.sget_wide.d.T_sget_wide_5.i1 J
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_5.i1 J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.java
deleted file mode 100644
index 6021edd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_5 {
-
- public long i1 = 5;
- public long run(){
- return i1;
- }
-}
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.d
deleted file mode 100644
index 48e59f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_6.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.TestStubs.TestStubField J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.java
deleted file mode 100644
index f2744cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_6 {
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.d
deleted file mode 100644
index b34ddd6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_7.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v0, dot.junit.opcodes.sget_wide.d.T_sget_wide_7no_class.i1 J
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.java
deleted file mode 100644
index e97e416..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_7 {
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.d
deleted file mode 100644
index d53c7dd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sget_wide_8.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.T_sget_wide_8.i1N J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.java
deleted file mode 100644
index 95b2dbb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_8 {
- public long run() {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_9.d b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_9.d
deleted file mode 100644
index e223578..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_9.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sget_wide.d.StubInitError
-.super java/lang/Object
-
-.field public static value J
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- const-wide v0, 1
- sput-wide v0, dot.junit.opcodes.sget_wide.d.StubInitError.value J
- return-void
-.end method
-
-
-.source T_sget_wide_9.java
-.class public dot.junit.opcodes.sget_wide.d.T_sget_wide_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()J
-.limit regs 3
-
- sget-wide v1, dot.junit.opcodes.sget_wide.d.StubInitError.value J
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_9.java b/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_9.java
deleted file mode 100644
index a19f781..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sget_wide.d;
-
-public class T_sget_wide_9 {
-
- public long run(){
- return -99;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/Test_shl_int.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int/Test_shl_int.java
deleted file mode 100644
index 5b5d6ee..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/Test_shl_int.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package dot.junit.opcodes.shl_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shl_int.d.T_shl_int_1;
-import dot.junit.opcodes.shl_int.d.T_shl_int_6;
-
-public class Test_shl_int extends DxTestCase {
-
- /**
- * @title 15 << 1
- */
- public void testN1() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(30, t.run(15, 1));
- }
-
- /**
- * @title 33 << 2
- */
- public void testN2() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(132, t.run(33, 2));
- }
-
- /**
- * @title -15 << 1
- */
- public void testN3() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(-30, t.run(-15, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(0x80000000, t.run(1, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(66, t.run(33, 33));
- }
-
- /**
- * @title Types of arguments - float, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation float parameters makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shl_int_6 t = new T_shl_int_6();
- try {
- t.run(3.14f, 1.2f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(0xfffffffe, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_shl_int_1 t = new T_shl_int_1();
- assertEquals(1, t.run(1, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.d
deleted file mode 100644
index a9e9ede..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_1.java
-.class public dot.junit.opcodes.shl_int.d.T_shl_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shl-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.java
deleted file mode 100644
index 4480d75..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_int.d;
-
-public class T_shl_int_1 {
-
- public int run(int a, int b) {
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_2.d
deleted file mode 100644
index f1955e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2.java
-.class public dot.junit.opcodes.shl_int.d.T_shl_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shl-int v0, v7, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_3.d
deleted file mode 100644
index 88fff38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_3.java
-.class public dot.junit.opcodes.shl_int.d.T_shl_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)I
-.limit regs 8
-
- shl-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_4.d
deleted file mode 100644
index 2b2fd1e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_4.java
-.class public dot.junit.opcodes.shl_int.d.T_shl_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- shl-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_5.d
deleted file mode 100644
index 1ae15e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_5.java
-.class public dot.junit.opcodes.shl_int.d.T_shl_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shl-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.d
deleted file mode 100644
index 1527b6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_6.java
-.class public dot.junit.opcodes.shl_int.d.T_shl_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- shl-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.java
deleted file mode 100644
index bb6806c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_int.d;
-
-public class T_shl_int_6 {
-
- public int run(float a, float b) {
- return (int)a << (int)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java
deleted file mode 100644
index 7774bbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package dot.junit.opcodes.shl_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_1;
-import dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_6;
-
-public class Test_shl_int_2addr extends DxTestCase {
-
- /**
- * @title 15 << 1
- */
- public void testN1() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(30, t.run(15, 1));
- }
-
- /**
- * @title 33 << 2
- */
- public void testN2() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(132, t.run(33, 2));
- }
-
- /**
- * @title -15 << 1
- */
- public void testN3() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(-30, t.run(-15, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(0x80000000, t.run(1, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(66, t.run(33, 33));
- }
-
- /**
- * @title Types of arguments - float, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation for float parameters makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shl_int_2addr_6 t = new T_shl_int_2addr_6();
- try {
- t.run(3.14f, 1.2f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(0xfffffffe, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(0, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_shl_int_2addr_1 t = new T_shl_int_2addr_1();
- assertEquals(1, t.run(1, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.d
deleted file mode 100644
index 380c8c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2addr_1.java
-.class public dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shl-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.java
deleted file mode 100644
index 69d8de4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_int_2addr.d;
-
-public class T_shl_int_2addr_1 {
-
- public int run(int a, int b) {
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2.d
deleted file mode 100644
index bb92f80..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2addr_2.java
-.class public dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shl-int/2addr v7, v8
- return v7
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3.d
deleted file mode 100644
index 7785e26..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2addr_3.java
-.class public dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)I
-.limit regs 8
-
- shl-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4.d
deleted file mode 100644
index 3860a02..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2addr_4.java
-.class public dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- shl-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5.d
deleted file mode 100644
index affe561..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2addr_5.java
-.class public dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shl-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.d
deleted file mode 100644
index 2299e9c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_2addr_6.java
-.class public dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- shl-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.java
deleted file mode 100644
index f82be9f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_int_2addr.d;
-
-public class T_shl_int_2addr_6 {
-
- public int run(float a, float b) {
- return (int)a << (int)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java
deleted file mode 100644
index 186ddba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_1;
-import dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_2;
-import dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_3;
-import dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_4;
-import dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_5;
-import dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_6;
-
-public class Test_shl_int_lit8 extends DxTestCase {
-
- /**
- * @title 15 << 1
- */
- public void testN1() {
- T_shl_int_lit8_1 t = new T_shl_int_lit8_1();
- assertEquals(30, t.run(15));
- }
-
- /**
- * @title 33 << 2
- */
- public void testN2() {
- T_shl_int_lit8_2 t = new T_shl_int_lit8_2();
- assertEquals(132, t.run(33));
- }
-
- /**
- * @title -15 << 1
- */
- public void testN3() {
- T_shl_int_lit8_1 t = new T_shl_int_lit8_1();
- assertEquals(-30, t.run(-15));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shl_int_lit8_3 t = new T_shl_int_lit8_3();
- assertEquals(0x80000000, t.run(1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_shl_int_lit8_4 t = new T_shl_int_lit8_4();
- assertEquals(66, t.run(33));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shl_int_lit8_6 t = new T_shl_int_lit8_6();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shl_int_lit8_3 t = new T_shl_int_lit8_3();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_shl_int_lit8_1 t = new T_shl_int_lit8_1();
- assertEquals(0xfffffffe, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_shl_int_lit8_1 t = new T_shl_int_lit8_1();
- assertEquals(0, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_shl_int_lit8_5 t = new T_shl_int_lit8_5();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.d
deleted file mode 100644
index 8230b0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_1.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shl-int/lit8 v0, v7, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.java
deleted file mode 100644
index 31b0543..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8.d;
-
-public class T_shl_int_lit8_1 {
-
- public int run(int a) {
- int b = 1;
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10.d
deleted file mode 100644
index ebcef08..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_10.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- shl-int/lit8 v0, v5, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.d
deleted file mode 100644
index ab5d308..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_2.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shl-int/lit8 v0, v7, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.java
deleted file mode 100644
index 14f04e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8.d;
-
-public class T_shl_int_lit8_2 {
-
- public int run(int a) {
- int b = 2;
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.d
deleted file mode 100644
index b7c3c3b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_3.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shl-int/lit8 v0, v7, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.java
deleted file mode 100644
index 7b76307..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8.d;
-
-public class T_shl_int_lit8_3 {
-
- public int run(int a) {
- int b = -1;
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.d
deleted file mode 100644
index 3416035..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_4.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shl-int/lit8 v0, v7, 33
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.java
deleted file mode 100644
index 6b80a22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8.d;
-
-public class T_shl_int_lit8_4 {
-
- public int run(int a) {
- int b = 33;
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.d
deleted file mode 100644
index bb0ebbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_5.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shl-int/lit8 v0, v7, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.java
deleted file mode 100644
index f170338..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8.d;
-
-public class T_shl_int_lit8_5 {
-
- public int run(int a) {
- int b = 0;
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.d
deleted file mode 100644
index 3e2b9d5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_6.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 8
-
- shl-int/lit8 v0, v7, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.java
deleted file mode 100644
index e41def3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shl_int_lit8.d;
-
-public class T_shl_int_lit8_6 {
-
- public int run(float a) {
- int b = 1;
- return (int)a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7.d
deleted file mode 100644
index c2a0301..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_7.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shl-int/lit8 v0, v8, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8.d
deleted file mode 100644
index 49062a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_8.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- shl-int/lit8 v0, v6, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9.d
deleted file mode 100644
index 9d91c49..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_int_lit8_9.java
-.class public dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- shl-int/lit8 v0, v6, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/Test_shl_long.java b/tools/vm-tests/src/dot/junit/opcodes/shl_long/Test_shl_long.java
deleted file mode 100644
index d22ba92..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/Test_shl_long.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package dot.junit.opcodes.shl_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shl_long.d.T_shl_long_1;
-import dot.junit.opcodes.shl_long.d.T_shl_long_7;
-
-public class Test_shl_long extends DxTestCase {
-
- /**
- * @title Arguments = 5000000000l, 3
- */
- public void testN1() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(40000000000l, t.run(5000000000l, 3));
- }
-
- /**
- * @title Arguments = 5000000000l, 1
- */
- public void testN2() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(10000000000l, t.run(5000000000l, 1));
- }
-
- /**
- * @title Arguments = -5000000000l, 1
- */
- public void testN3() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(-10000000000l, t.run(-5000000000l, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(0x8000000000000000l, t.run(1l, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 64.
- */
- public void testN5() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(130l, t.run(65l, 65));
- }
-
- /**
- * @title Types of arguments - double, int. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shl_long_7 t = new T_shl_long_7();
- try {
- t.run(4.67d, 1);
- } catch (Throwable e) {
- }
- }
-
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB2() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(1, t.run(1, 0));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & 1
- */
- public void testB3() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(0xfffffffe, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE & 1
- */
- public void testB4() {
- T_shl_long_1 t = new T_shl_long_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long & double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int & int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float & int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.d
deleted file mode 100644
index 0293191..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_1.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shl-long v0, v8, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.java
deleted file mode 100644
index 27e13ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_long.d;
-
-public class T_shl_long_1 {
-
- public long run(long a, int b) {
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_2.d
deleted file mode 100644
index 1a5fe79..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shl-long v0, v8, v11
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_3.d
deleted file mode 100644
index 0f33164..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_3.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 11
-
- shl-long v0, v7, v9
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_4.d
deleted file mode 100644
index 4392e2a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_4.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)J
-.limit regs 11
-
- shl-long v0, v9, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_5.d
deleted file mode 100644
index 29ad593..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_5.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)J
-.limit regs 11
-
- shl-long v0, v9, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_6.d
deleted file mode 100644
index 105c0e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_6.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shl-long v0, v7, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.d
deleted file mode 100644
index ed9faf0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_7.java
-.class public dot.junit.opcodes.shl_long.d.T_shl_long_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)J
-.limit regs 11
-
- shl-long v0, v8, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.java b/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.java
deleted file mode 100644
index ecc3e1f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_long.d;
-
-public class T_shl_long_7 {
-
- public long run(double a, int b) {
- return (long)a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java
deleted file mode 100644
index 1113905..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package dot.junit.opcodes.shl_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_1;
-import dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_7;
-
-public class Test_shl_long_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 5000000000l, 3
- */
- public void testN1() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(40000000000l, t.run(5000000000l, 3));
- }
-
- /**
- * @title Arguments = 5000000000l, 1
- */
- public void testN2() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(10000000000l, t.run(5000000000l, 1));
- }
-
- /**
- * @title Arguments = -5000000000l, 1
- */
- public void testN3() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(-10000000000l, t.run(-5000000000l, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(0x8000000000000000l, t.run(1l, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 64.
- */
- public void testN5() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(130l, t.run(65l, 65));
- }
-
- /**
- * @title Types of arguments - double, int. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shl_long_2addr_7 t = new T_shl_long_2addr_7();
- try {
- t.run(4.67d, 1);
- } catch (Throwable e) {
- }
- }
-
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB2() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(1, t.run(1, 0));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & 1
- */
- public void testB3() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(0xfffffffe, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE & 1
- */
- public void testB4() {
- T_shl_long_2addr_1 t = new T_shl_long_2addr_1();
- assertEquals(0l, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.d
deleted file mode 100644
index b2e3bb9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_1.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shl-long/2addr v8, v10
- return-wide v8
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.java
deleted file mode 100644
index 569531d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_long_2addr.d;
-
-public class T_shl_long_2addr_1 {
-
- public long run(long a, int b) {
- return a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2.d
deleted file mode 100644
index fd4598a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_2.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shl-long/2addr v8, v11
- return-wide v8
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3.d
deleted file mode 100644
index 41c08f5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_3.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 11
-
- shl-long/2addr v7, v9
- return-wide v7
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4.d
deleted file mode 100644
index 4c69423..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_4.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)J
-.limit regs 11
-
- shl-long/2addr v9, v10
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5.d
deleted file mode 100644
index bb9b45b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_5.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)J
-.limit regs 11
-
- shl-long/2addr v9, v10
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6.d
deleted file mode 100644
index 50738c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_6.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shl-long/2addr v7, v10
- return-wide v7
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.d b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.d
deleted file mode 100644
index 42b0717..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shl_long_2addr_7.java
-.class public dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)J
-.limit regs 11
-
- shl-long/2addr v8, v10
- return-wide v8
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.java b/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.java
deleted file mode 100644
index f6978ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shl_long_2addr.d;
-
-public class T_shl_long_2addr_7 {
-
- public long run(double a, int b) {
- return (long)a << b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/Test_shr_int.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int/Test_shr_int.java
deleted file mode 100644
index d81d7c8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/Test_shr_int.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package dot.junit.opcodes.shr_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shr_int.d.T_shr_int_1;
-import dot.junit.opcodes.shr_int.d.T_shr_int_6;
-
-public class Test_shr_int extends DxTestCase {
-
- /**
- * @title 15 >> 1
- */
- public void testN1() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(7, t.run(15, 1));
- }
-
- /**
- * @title 33 >> 2
- */
- public void testN2() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(8, t.run(33, 2));
- }
-
- /**
- * @title -15 >> 1
- */
- public void testN3() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(-8, t.run(-15, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(0, t.run(1, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(16, t.run(33, 33));
- }
-
- /**
- * @title Types of arguments - float, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float parameters makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shr_int_6 t = new T_shr_int_6();
- try {
- t.run(3.14f, 1.2f);
- } catch (Throwable e) {
- }
- }
-
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(0xc0000000, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_shr_int_1 t = new T_shr_int_1();
- assertEquals(1, t.run(1, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.d
deleted file mode 100644
index 9eaa104..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_1.java
-.class public dot.junit.opcodes.shr_int.d.T_shr_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shr-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.java
deleted file mode 100644
index 68a7062..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_int.d;
-
-public class T_shr_int_1 {
-
- public int run(int a, int b) {
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_2.d
deleted file mode 100644
index 8800018..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2.java
-.class public dot.junit.opcodes.shr_int.d.T_shr_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shr-int v0, v6, v8
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_3.d
deleted file mode 100644
index 1f0c528..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_3.java
-.class public dot.junit.opcodes.shr_int.d.T_shr_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)I
-.limit regs 8
-
- shr-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_4.d
deleted file mode 100644
index eede586..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_4.java
-.class public dot.junit.opcodes.shr_int.d.T_shr_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- shr-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_5.d
deleted file mode 100644
index fe57998..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_5.java
-.class public dot.junit.opcodes.shr_int.d.T_shr_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shr-int v0, v5, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.d
deleted file mode 100644
index 0323c5f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_6.java
-.class public dot.junit.opcodes.shr_int.d.T_shr_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- shr-int v0, v6, v7
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.java
deleted file mode 100644
index 86804e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_int.d;
-
-public class T_shr_int_6 {
-
- public int run(float a, float b) {
- return (int)a >> (int)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java
deleted file mode 100644
index b52cafe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package dot.junit.opcodes.shr_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_1;
-import dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_6;
-
-public class Test_shr_int_2addr extends DxTestCase {
-
- /**
- * @title 15 >> 1
- */
- public void testN1() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(7, t.run(15, 1));
- }
-
- /**
- * @title 33 >> 2
- */
- public void testN2() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(8, t.run(33, 2));
- }
-
- /**
- * @title -15 >> 1
- */
- public void testN3() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(-8, t.run(-15, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(0, t.run(1, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(16, t.run(33, 33));
- }
-
- /**
- * @title Types of arguments - float, float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shr_int_2addr_6 t = new T_shr_int_2addr_6();
- try {
- t.run(3.14f, 1.2f);
- } catch (Throwable e) {
- }
- }
-
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(0xc0000000, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_shr_int_2addr_1 t = new T_shr_int_2addr_1();
- assertEquals(1, t.run(1, 0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.d
deleted file mode 100644
index 28765b3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2addr_1.java
-.class public dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shr-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.java
deleted file mode 100644
index e00a03d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_int_2addr.d;
-
-public class T_shr_int_2addr_1 {
-
- public int run(int a, int b) {
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2.d
deleted file mode 100644
index a7bc7ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2addr_2.java
-.class public dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shr-int/2addr v6, v8
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3.d
deleted file mode 100644
index 0a6ea58..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2addr_3.java
-.class public dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)I
-.limit regs 8
-
- shr-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4.d
deleted file mode 100644
index 3d4d094..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2addr_4.java
-.class public dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)I
-.limit regs 8
-
- shr-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5.d
deleted file mode 100644
index 4b35e2a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2addr_5.java
-.class public dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 8
-
- shr-int/2addr v5, v7
- return v5
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.d
deleted file mode 100644
index b563cc0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_2addr_6.java
-.class public dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)I
-.limit regs 8
-
- shr-int/2addr v6, v7
- return v6
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.java
deleted file mode 100644
index f9e057f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_int_2addr.d;
-
-public class T_shr_int_2addr_6 {
-
- public int run(float a, float b) {
- return (int)a >> (int)b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java
deleted file mode 100644
index af03cff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_1;
-import dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_2;
-import dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_3;
-import dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_4;
-import dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_5;
-import dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_6;
-
-public class Test_shr_int_lit8 extends DxTestCase {
-
- /**
- * @title 15 >> 1
- */
- public void testN1() {
- T_shr_int_lit8_1 t = new T_shr_int_lit8_1();
- assertEquals(7, t.run(15));
- }
-
- /**
- * @title 33 >> 2
- */
- public void testN2() {
- T_shr_int_lit8_2 t = new T_shr_int_lit8_2();
- assertEquals(8, t.run(33));
- }
-
- /**
- * @title -15 >> 1
- */
- public void testN3() {
- T_shr_int_lit8_1 t = new T_shr_int_lit8_1();
- assertEquals(-8, t.run(-15));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shr_int_lit8_3 t = new T_shr_int_lit8_3();
- assertEquals(0, t.run(1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_shr_int_lit8_4 t = new T_shr_int_lit8_4();
- assertEquals(16, t.run(33));
- }
-
- /**
- * @title Types of arguments - float. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shr_int_lit8_6 t = new T_shr_int_lit8_6();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shr_int_lit8_3 t = new T_shr_int_lit8_3();
- assertEquals(0, t.run(0));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_shr_int_lit8_1 t = new T_shr_int_lit8_1();
- assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_shr_int_lit8_1 t = new T_shr_int_lit8_1();
- assertEquals(0xc0000000, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_shr_int_lit8_5 t = new T_shr_int_lit8_5();
- assertEquals(1, t.run(1));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.d
deleted file mode 100644
index d34130f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_1.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v7, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.java
deleted file mode 100644
index b784123..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8.d;
-
-public class T_shr_int_lit8_1 {
-
- public int run(int a) {
- int b = 1;
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10.d
deleted file mode 100644
index c94aa21..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_10.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v6, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.d
deleted file mode 100644
index 1a3b1bd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_2.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v7, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.java
deleted file mode 100644
index 1ab910d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8.d;
-
-public class T_shr_int_lit8_2 {
-
- public int run(int a) {
- int b = 2;
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.d
deleted file mode 100644
index 002cadf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_3.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v7, -1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.java
deleted file mode 100644
index 5e85115..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8.d;
-
-public class T_shr_int_lit8_3 {
-
- public int run(int a) {
- int b = -1;
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.d
deleted file mode 100644
index 3b9b507..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_4.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v7, 33
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.java
deleted file mode 100644
index cc49861..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8.d;
-
-public class T_shr_int_lit8_4 {
-
- public int run(int a) {
- int b = 33;
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.d
deleted file mode 100644
index 871040a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_5.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v7, 0
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.java
deleted file mode 100644
index b27c64b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8.d;
-
-public class T_shr_int_lit8_5 {
-
- public int run(int a) {
- int b = 0;
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.d
deleted file mode 100644
index 761a30e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_6.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 8
-
- shr-int/lit8 v0, v7, 1
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.java
deleted file mode 100644
index a24bcb9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dot.junit.opcodes.shr_int_lit8.d;
-
-public class T_shr_int_lit8_6 {
-
- public int run(float a) {
- int b = 1;
- return (int)a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7.d
deleted file mode 100644
index 34559e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_7.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 8
-
- shr-int/lit8 v0, v8, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8.d
deleted file mode 100644
index d157daf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_8.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 8
-
- shr-int/lit8 v0, v6, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9.d
deleted file mode 100644
index ed24326..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_int_lit8_9.java
-.class public dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 8
-
- shr-int/lit8 v0, v6, 2
- return v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/Test_shr_long.java b/tools/vm-tests/src/dot/junit/opcodes/shr_long/Test_shr_long.java
deleted file mode 100644
index 66bc8b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/Test_shr_long.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package dot.junit.opcodes.shr_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shr_long.d.T_shr_long_1;
-import dot.junit.opcodes.shr_long.d.T_shr_long_7;
-
-public class Test_shr_long extends DxTestCase {
-
- /**
- * @title Arguments = 40000000000l, 3
- */
- public void testN1() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(5000000000l, t.run(40000000000l, 3));
- }
-
- /**
- * @title Arguments = 40000000000l, 1
- */
- public void testN2() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(20000000000l, t.run(40000000000l, 1));
- }
-
- /**
- * @title Arguments = -40000000000l, 1
- */
- public void testN3() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(-20000000000l, t.run(-40000000000l, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(0l, t.run(1l, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 64.
- */
- public void testN5() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(32, t.run(65l, 65));
- }
-
- /**
- * @title Types of arguments - double, int. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and int makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shr_long_7 t = new T_shr_long_7();
- try {
- t.run(4.67d, 1);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(0l, t.run(0l, -1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB2() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(1l, t.run(1l, 0));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & 1
- */
- public void testB3() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(0x3FFFFFFFFFFFFFFFl, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE & 1
- */
- public void testB4() {
- T_shr_long_1 t = new T_shr_long_1();
- assertEquals(0xc000000000000000l, t.run(Long.MIN_VALUE, 1));
- }
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.d
deleted file mode 100644
index 08c82f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_1.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shr-long v0, v8, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.java
deleted file mode 100644
index e15d414..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_long.d;
-
-public class T_shr_long_1 {
-
- public long run(long a, int b) {
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_2.d
deleted file mode 100644
index a87004a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shr-long v0, v8, v11
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_3.d
deleted file mode 100644
index 9c78f73..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_3.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 11
-
- shr-long v0, v7, v9
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_4.d
deleted file mode 100644
index e6691cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_4.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)J
-.limit regs 11
-
- shr-long v0, v9, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_5.d
deleted file mode 100644
index f5e4cb9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_5.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)J
-.limit regs 11
-
- shr-long v0, v9, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_6.d
deleted file mode 100644
index 427d1c2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_6.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shr-long v0, v7, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.d
deleted file mode 100644
index ad83dc8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_7.java
-.class public dot.junit.opcodes.shr_long.d.T_shr_long_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)J
-.limit regs 11
-
- shr-long v0, v8, v10
- return-wide v0
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.java b/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.java
deleted file mode 100644
index ca42ea9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_long.d;
-
-public class T_shr_long_7 {
-
- public long run(double a, int b) {
- return (long)a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java
deleted file mode 100644
index 22c4530..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package dot.junit.opcodes.shr_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_1;
-import dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_7;
-
-public class Test_shr_long_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 40000000000l, 3
- */
- public void testN1() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(5000000000l, t.run(40000000000l, 3));
- }
-
- /**
- * @title Arguments = 40000000000l, 1
- */
- public void testN2() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(20000000000l, t.run(40000000000l, 1));
- }
-
- /**
- * @title Arguments = -40000000000l, 1
- */
- public void testN3() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(-20000000000l, t.run(-40000000000l, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(0l, t.run(1l, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 64.
- */
- public void testN5() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(32, t.run(65l, 65));
- }
-
- /**
- * @title Types of arguments - double, int. Dalvik doens't distinguish 64-bits types internally,
- * so this operation of double and int makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_shr_long_2addr_7 t = new T_shr_long_2addr_7();
- try {
- t.run(4.67d, 1);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(0l, t.run(0l, -1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB2() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(1l, t.run(1l, 0));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & 1
- */
- public void testB3() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(0x3FFFFFFFFFFFFFFFl, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE & 1
- */
- public void testB4() {
- T_shr_long_2addr_1 t = new T_shr_long_2addr_1();
- assertEquals(0xc000000000000000l, t.run(Long.MIN_VALUE, 1));
- }
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.d
deleted file mode 100644
index 0e9c36b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_1.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shr-long/2addr v8, v10
- return-wide v8
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.java
deleted file mode 100644
index 1c5691e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_long_2addr.d;
-
-public class T_shr_long_2addr_1 {
-
- public long run(long a, int b) {
- return a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2.d
deleted file mode 100644
index a0ebe17..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_2.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shr-long/2addr v8, v11
- return-wide v8
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3.d
deleted file mode 100644
index c07af2f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_3.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 11
-
- shr-long/2addr v7, v9
- return-wide v7
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4.d
deleted file mode 100644
index 9db034e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_4.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)J
-.limit regs 11
-
- shr-long/2addr v9, v10
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5.d
deleted file mode 100644
index f1045cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_5.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FI)J
-.limit regs 11
-
- shr-long/2addr v9, v10
- return-wide v9
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6.d
deleted file mode 100644
index 1326e76..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_6.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 11
-
- shr-long/2addr v7, v10
- return-wide v7
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.d b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.d
deleted file mode 100644
index 3b3db0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.d
+++ /dev/null
@@ -1,18 +0,0 @@
-.source T_shr_long_2addr_7.java
-.class public dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)J
-.limit regs 11
-
- shr-long/2addr v8, v10
- return-wide v8
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.java b/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.java
deleted file mode 100644
index ed3e1e8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dot.junit.opcodes.shr_long_2addr.d;
-
-public class T_shr_long_2addr_7 {
-
- public long run(double a, int b) {
- return (long)a >> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java
deleted file mode 100644
index 66f5c39..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sparse_switch;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sparse_switch.d.T_sparse_switch_1;
-import dot.junit.opcodes.sparse_switch.d.T_sparse_switch_2
-;
-
-public class Test_sparse_switch extends DxTestCase {
-
- /**
- * @title try different values
- */
- public void testN1() {
- T_sparse_switch_1 t = new T_sparse_switch_1();
- assertEquals(2, t.run(-1));
-
- assertEquals(-1, t.run(9));
- assertEquals(20, t.run(10));
- assertEquals(-1, t.run(11));
-
- assertEquals(-1, t.run(14));
- assertEquals(20, t.run(15));
- assertEquals(-1, t.run(16));
- }
-
- /**
- * @title Types of arguments - float, int. Dalvik doens't distinguish 32-bits types internally,
- * so this operation of float and int makes no sense but shall not crash the VM.
- */
- public void testN2() {
- try {
- T_sparse_switch_2 t = new T_sparse_switch_2();
- t.run(-1.23f);
- } catch(Throwable t) {
- }
- }
-
- /**
- * @title Argument = Integer.MAX_VALUE
- */
- public void testB1() {
- T_sparse_switch_1 t = new T_sparse_switch_1();
- assertEquals(-1, t.run(Integer.MAX_VALUE));
- }
-
- /**
- * @title Argument = Integer.MIN_VALUE
- */
- public void testB2() {
- T_sparse_switch_1 t = new T_sparse_switch_1();
- assertEquals(-1, t.run(Integer.MIN_VALUE));
- }
-
- /**
- * @title Argument = 0
- */
- public void testB3() {
- T_sparse_switch_1 t = new T_sparse_switch_1();
- assertEquals(-1, t.run(0));
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title type of argument - double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title type of argument - reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A8
- * @title branch target shall be inside the method
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A8
- * @title branch target shall not be "inside" instruction
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A8
- * @title offset to table shall be inside method
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A8
- * @title pairs shall be sorted in ascending order
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A8
- * @title number of entries in jump table
- */
- public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B22
- * @title sparse-switch-data pseudo-instructions must not be reachable by control flow
- */
- public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A8
- * @title table has wrong ident code
- */
- public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_1.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_1.d
deleted file mode 100644
index bd3aaa5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_1.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_1.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_1.java b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_1.java
deleted file mode 100644
index 05d0ba9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sparse_switch.d;
-
-public class T_sparse_switch_1 {
-
- public int run(int i) {
- switch (i) {
- case -1:
- return 2;
- case 10:
- case 15:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.d
deleted file mode 100644
index 5853adb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_11.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.dfh b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.dfh
deleted file mode 100644
index 81eac01..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_11.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : cbc95483
- 83 54 C9 CB
-// parsed: offset 12, len 20: signature : 4fcf...5763
- 4F CF BE 7C 4E 38 25 A2 FB 35 7F 9B C3 DF 90 D5 67 72 57 63
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_11;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 417 (0x0001a1) "Ljava/lang/Object;"
- A1 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 437 (0x0001b5) "T_sparse_switch_11.java"
- B5 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 462 (0x0001ce) "V"
- CE 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 465 (0x0001d1) "run"
- D1 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_11;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_11;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_sparse_switch_11.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 470 (0x0001d6)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D6 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_11.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_11.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: sparse-switch v4, 00000010 // +0x00000010
- 2C 04 10 00 00 00
- // parsed: offset 286, len 6: |0003: const v4, #float nan // #0xffffffff int
- 14 04 FF FF FF FF
- // parsed: offset 292, len 2: |0006: return v4
- 0F 04
- // parsed: offset 294, len 6: |0007: const v4, #float 0.000000 // #0x00000002 int
- 14 04 02 00 00 00
- // parsed: offset 300, len 2: |000a: return v4
- 0F 04
- // parsed: offset 302, len 6: |000b: const v4, #float 0.000000 // #0x00000014 int
- 14 04 14 00 00 00
- // parsed: offset 308, len 2: |000e: return v4
- 0F 04
- // parsed: offset 310, len 2: |000f: nop // spacer
- 00 00
- // parsed: offset 312, len 28: |0010: sparse-switch-data (14 units)
-//@mod 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- 00 02 03 00 FF FF FF FF 0F 00 00 00 0A 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 56: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_11;"
- 36 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 61 72 73 65 5F 73 77 69 74 63 68 2F 64 2F 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 31 31 3B 00
-// parsed: offset 417, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 437, len 25: TYPE_STRING_DATA_ITEM [5] "T_sparse_switch_11.java"
- 17 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 31 31 2E 6A 61 76 61 00
-// parsed: offset 462, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 465, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_11;"
- // parsed: offset 470, len 1: static_fields_size: 0
- 00
- // parsed: offset 471, len 1: instance_fields_size: 0
- 00
- // parsed: offset 472, len 1: direct_methods_size: 1
- 01
- // parsed: offset 473, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 474, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 475, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 478, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 480, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 481, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 482, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 470 (0x0001d6)
- 00 20 00 00 01 00 00 00 D6 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.d
deleted file mode 100644
index feff623..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_12.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_12
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.dfh b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.dfh
deleted file mode 100644
index 2d9ee69..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : b034540d
- 0D 54 34 B0
-// parsed: offset 12, len 20: signature : 17df...83d1
- 17 DF 40 0E 7B 84 69 AA B8 A3 BF 9B 70 B0 7D 1D CF 2A 83 D1
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_12;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 417 (0x0001a1) "Ljava/lang/Object;"
- A1 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 437 (0x0001b5) "T_sparse_switch_12.java"
- B5 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 462 (0x0001ce) "V"
- CE 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 465 (0x0001d1) "run"
- D1 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_12;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_12;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_sparse_switch_12.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 470 (0x0001d6)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D6 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_12.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_12.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: sparse-switch v4, 00000010 // +0x00000010
- 2C 04 10 00 00 00
- // parsed: offset 286, len 6: |0003: const v4, #float nan // #0xffffffff int
- 14 04 FF FF FF FF
- // parsed: offset 292, len 2: |0006: return v4
- 0F 04
- // parsed: offset 294, len 6: |0007: const v4, #float 0.000000 // #0x00000002 int
- 14 04 02 00 00 00
- // parsed: offset 300, len 2: |000a: return v4
- 0F 04
- // parsed: offset 302, len 6: |000b: const v4, #float 0.000000 // #0x00000014 int
- 14 04 14 00 00 00
- // parsed: offset 308, len 2: |000e: return v4
- 0F 04
- // parsed: offset 310, len 2: |000f: nop // spacer
- 00 00
- // parsed: offset 312, len 28: |0010: sparse-switch-data (14 units)
-//@mod 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- 00 02 04 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 56: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_12;"
- 36 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 61 72 73 65 5F 73 77 69 74 63 68 2F 64 2F 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 31 32 3B 00
-// parsed: offset 417, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 437, len 25: TYPE_STRING_DATA_ITEM [5] "T_sparse_switch_12.java"
- 17 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 31 32 2E 6A 61 76 61 00
-// parsed: offset 462, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 465, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_12;"
- // parsed: offset 470, len 1: static_fields_size: 0
- 00
- // parsed: offset 471, len 1: instance_fields_size: 0
- 00
- // parsed: offset 472, len 1: direct_methods_size: 1
- 01
- // parsed: offset 473, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 474, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 475, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 478, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 480, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 481, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 482, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 470 (0x0001d6)
- 00 20 00 00 01 00 00 00 D6 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.java b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.java
deleted file mode 100644
index c8f40c1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_12.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sparse_switch.d;
-
-public class T_sparse_switch_12 {
-
- public void run() {
- switch (1) {
- case -1:
- return;
- case 10:
- return;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_13.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_13.d
deleted file mode 100644
index 8c7814d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_13.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_13.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_13
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- goto Label0
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-Label0:
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.d
deleted file mode 100644
index 074c119..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_14.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_14
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- goto Label0
-Label0:
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.dfh b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.dfh
deleted file mode 100644
index 3f17abc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.dfh
+++ /dev/null
@@ -1,274 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_14.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 7a9e539f
- 9F 53 9E 7A
-// parsed: offset 12, len 20: signature : 0e0e...6b5f
- 0E 0E E3 52 F8 B0 52 FC 24 7F 08 37 B9 F7 17 79 D1 74 6B 5F
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_14;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 417 (0x0001a1) "Ljava/lang/Object;"
- A1 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 437 (0x0001b5) "T_sparse_switch_14.java"
- B5 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 462 (0x0001ce) "V"
- CE 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 465 (0x0001d1) "run"
- D1 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_14;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_14;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_sparse_switch_14.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 470 (0x0001d6)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D6 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_14.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_14.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 2: |0000: goto 0001 // +0x0001
- 28 01
- // parsed: offset 282, len 6: |0001: sparse-switch v4, 00000010 // +0x0000000f
- 2C 04 0F 00 00 00
- // parsed: offset 288, len 6: |0004: const v4, #float nan // #0xffffffff int
- 14 04 FF FF FF FF
- // parsed: offset 294, len 2: |0007: return v4
- 0F 04
- // parsed: offset 296, len 6: |0008: const v4, #float 0.000000 // #0x00000002 int
- 14 04 02 00 00 00
- // parsed: offset 302, len 2: |000b: return v4
- 0F 04
- // parsed: offset 304, len 6: |000c: const v4, #float 0.000000 // #0x00000014 int
- 14 04 14 00 00 00
- // parsed: offset 310, len 2: |000f: return v4
- 0F 04
- // parsed: offset 312, len 28: |0010: sparse-switch-data (14 units)
-//@mod 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- 00 05 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 56: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_14;"
- 36 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 61 72 73 65 5F 73 77 69 74 63 68 2F 64 2F 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 31 34 3B 00
-// parsed: offset 417, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 437, len 25: TYPE_STRING_DATA_ITEM [5] "T_sparse_switch_14.java"
- 17 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 31 34 2E 6A 61 76 61 00
-// parsed: offset 462, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 465, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_14;"
- // parsed: offset 470, len 1: static_fields_size: 0
- 00
- // parsed: offset 471, len 1: instance_fields_size: 0
- 00
- // parsed: offset 472, len 1: direct_methods_size: 1
- 01
- // parsed: offset 473, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 474, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 475, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 478, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 480, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 481, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 482, len 2: code_off: 264 (0x000108)
- 88 02
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 470 (0x0001d6)
- 00 20 00 00 01 00 00 00 D6 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_2.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_2.d
deleted file mode 100644
index 0f8b90b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_2.d
+++ /dev/null
@@ -1,50 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_2.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 5
-
-Label3:
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_2.java b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_2.java
deleted file mode 100644
index e9344d1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sparse_switch.d;
-
-public class T_sparse_switch_2 {
-
- public int run(float i) {
- switch ((int)i) {
- case -1:
- return 2;
- case 10:
- case 15:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_3.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_3.d
deleted file mode 100644
index ce82bc9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_3.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_3.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
-Label3:
- sparse-switch v5
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_4.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_4.d
deleted file mode 100644
index 36f8c8b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_4.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_4.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(D)I
-.limit regs 5
-
-Label3:
- sparse-switch v3
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_5.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_5.d
deleted file mode 100644
index dc72c30..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_5.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_5.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(J)I
-.limit regs 5
-
-Label3:
- sparse-switch v3
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_6.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_6.d
deleted file mode 100644
index 25e418f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_6.d
+++ /dev/null
@@ -1,48 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_6.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
-Label3:
- sparse-switch v3
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.d
deleted file mode 100644
index 67f3328..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_7.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.dfh b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.dfh
deleted file mode 100644
index 47d52d4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : ffcf536e
- 6E 53 CF FF
-// parsed: offset 12, len 20: signature : d1bd...dc70
- D1 BD 9D 22 FC DA 04 F6 69 A9 22 1D 41 70 69 23 80 60 DC 70
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_7;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 416 (0x0001a0) "Ljava/lang/Object;"
- A0 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 436 (0x0001b4) "T_sparse_switch_7.java"
- B4 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 460 (0x0001cc) "V"
- CC 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 463 (0x0001cf) "run"
- CF 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_7;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_7;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_sparse_switch_7.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 468 (0x0001d4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_7.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_7.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: sparse-switch v4, 00000010 // +0x00000010
- 2C 04 10 00 00 00
- // parsed: offset 286, len 6: |0003: const v4, #float nan // #0xffffffff int
- 14 04 FF FF FF FF
- // parsed: offset 292, len 2: |0006: return v4
- 0F 04
- // parsed: offset 294, len 6: |0007: const v4, #float 0.000000 // #0x00000002 int
- 14 04 02 00 00 00
- // parsed: offset 300, len 2: |000a: return v4
- 0F 04
- // parsed: offset 302, len 6: |000b: const v4, #float 0.000000 // #0x00000014 int
- 14 04 14 00 00 00
- // parsed: offset 308, len 2: |000e: return v4
- 0F 04
- // parsed: offset 310, len 2: |000f: nop // spacer
- 00 00
- // parsed: offset 312, len 28: |0010: sparse-switch-data (14 units)
-//@mod 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 01 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_7;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 61 72 73 65 5F 73 77 69 74 63 68 2F 64 2F 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 37 3B 00
-// parsed: offset 416, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 436, len 24: TYPE_STRING_DATA_ITEM [5] "T_sparse_switch_7.java"
- 16 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 37 2E 6A 61 76 61 00
-// parsed: offset 460, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 463, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_7;"
- // parsed: offset 468, len 1: static_fields_size: 0
- 00
- // parsed: offset 469, len 1: instance_fields_size: 0
- 00
- // parsed: offset 470, len 1: direct_methods_size: 1
- 01
- // parsed: offset 471, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 472, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 473, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 476, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 478, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 479, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 480, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 482, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 20 00 00 01 00 00 00 D4 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.java b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.java
deleted file mode 100644
index d7a7a59..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_7.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sparse_switch.d;
-
-public class T_sparse_switch_7 {
-
- public int run(int i) {
- switch (i) {
- case -1:
- return 2;
- case 10:
- case 15:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.d
deleted file mode 100644
index ba0dae3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_8.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.dfh b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.dfh
deleted file mode 100644
index f65851b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 3b52538d
- 8D 53 52 3B
-// parsed: offset 12, len 20: signature : d117...b84c
- D1 17 6B A9 92 35 B7 F5 59 7E 60 68 BB 65 20 12 A4 EB B8 4C
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_8;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 416 (0x0001a0) "Ljava/lang/Object;"
- A0 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 436 (0x0001b4) "T_sparse_switch_8.java"
- B4 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 460 (0x0001cc) "V"
- CC 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 463 (0x0001cf) "run"
- CF 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_8;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_8;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_sparse_switch_8.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 468 (0x0001d4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_8.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_8.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: sparse-switch v4, 00000010 // +0x00000010
- 2C 04 10 00 00 00
- // parsed: offset 286, len 6: |0003: const v4, #float nan // #0xffffffff int
- 14 04 FF FF FF FF
- // parsed: offset 292, len 2: |0006: return v4
- 0F 04
- // parsed: offset 294, len 6: |0007: const v4, #float 0.000000 // #0x00000002 int
- 14 04 02 00 00 00
- // parsed: offset 300, len 2: |000a: return v4
- 0F 04
- // parsed: offset 302, len 6: |000b: const v4, #float 0.000000 // #0x00000014 int
- 14 04 14 00 00 00
- // parsed: offset 308, len 2: |000e: return v4
- 0F 04
- // parsed: offset 310, len 2: |000f: nop // spacer
- 00 00
- // parsed: offset 312, len 28: |0010: sparse-switch-data (14 units)
-//@mod 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0C 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_8;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 61 72 73 65 5F 73 77 69 74 63 68 2F 64 2F 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 38 3B 00
-// parsed: offset 416, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 436, len 24: TYPE_STRING_DATA_ITEM [5] "T_sparse_switch_8.java"
- 16 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 38 2E 6A 61 76 61 00
-// parsed: offset 460, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 463, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_8;"
- // parsed: offset 468, len 1: static_fields_size: 0
- 00
- // parsed: offset 469, len 1: instance_fields_size: 0
- 00
- // parsed: offset 470, len 1: direct_methods_size: 1
- 01
- // parsed: offset 471, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 472, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 473, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 476, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 478, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 479, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 480, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 482, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 20 00 00 01 00 00 00 D4 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.java b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.java
deleted file mode 100644
index a7176dd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_8.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sparse_switch.d;
-
-public class T_sparse_switch_8 {
-
- public int run(int i) {
- switch (i) {
- case -1:
- return 2;
- case 10:
- case 15:
- return 20;
- default:
- return -1;
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.d b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.d
deleted file mode 100644
index 2566813..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.d
+++ /dev/null
@@ -1,47 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sparse_switch_9.java
-.class public dot.junit.opcodes.sparse_switch.d.T_sparse_switch_9
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 5
-
- sparse-switch v4
- -1 : Label9
- 10 : Label12
- 15 : Label12
- sparse-switch-end
-Label6:
- const v4, -1
- return v4
-
-Label9:
- const v4, 2
- return v4
-
-Label12:
- const v4, 20
- return v4
-
-.end method
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.dfh b/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.dfh
deleted file mode 100644
index d5d171a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.dfh
+++ /dev/null
@@ -1,276 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.dex'...
-// Opened 'out/classes_dasm/dot/junit/opcodes/sparse_switch/d/T_sparse_switch_9.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : b289520e
- 0E 52 89 B2
-// parsed: offset 12, len 20: signature : 9f96...637f
- 9F 96 22 76 3B 40 5B 16 24 C5 DA 48 89 0B 4A 96 70 E8 63 7F
-// parsed: offset 32, len 4: file_size : 620
- 6C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 484 (0x0001e4)
- E4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 2
- 02 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 208 (0x0000d0)
- D0 00 00 00
-// parsed: offset 104, len 4: data_size : 380
- 7C 01 00 00
-// parsed: offset 108, len 4: data_off : 240 (0x0000f0)
- F0 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 346 (0x00015a) "<init>"
- 5A 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 354 (0x000162) "I"
- 62 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 357 (0x000165) "II"
- 65 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 361 (0x000169) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_9;"
- 69 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 416 (0x0001a0) "Ljava/lang/Object;"
- A0 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 436 (0x0001b4) "T_sparse_switch_9.java"
- B4 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 460 (0x0001cc) "V"
- CC 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 463 (0x0001cf) "run"
- CF 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 3 (0x000003) "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_9;"
- 03 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "Ljava/lang/Object;"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 6 (0x000006) "V"
- 06 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 2 (0x000002) "II"
-// return_type_idx: 0 (0x000000) "I"
-// parameters_off: 340 (0x000154)
- 02 00 00 00 00 00 00 00 54 01 00 00
-// parsed: offset 172, len 12: [1]
-// shorty_idx: 6 (0x000006) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 06 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 184, len 8: [0] class_idx: 1 (0x000001) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 01 00 01 00 00 00 00 00
-// parsed: offset 192, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 7 (0x000007) "run"
- 01 00 00 00 07 00 00 00
-// parsed: offset 200, len 8: [2] class_idx: 2 (0x000002) proto_idx: 1 (0x000001) name_idx: 0 (0x000000) "<init>"
- 02 00 01 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 208, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_9;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 5 "T_sparse_switch_9.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 468 (0x0001d4)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00 D4 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_9.<init>"
- // parsed: offset 240, len 2: registers_size: 1
- 01 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 1
- 01 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 6: |0000: invoke-direct {v1}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sparse_switch.d.T_sparse_switch_9.run"
- // parsed: offset 264, len 2: registers_size: 5
- 05 00
- // parsed: offset 266, len 2: ins_size: 2
- 02 00
- // parsed: offset 268, len 2: outs_size: 0
- 00 00
- // parsed: offset 270, len 2: tries_size: 0
- 00 00
- // parsed: offset 272, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 276, len 4: insns_size: 30
- 1E 00 00 00
- // insns:
- // parsed: offset 280, len 6: |0000: sparse-switch v4, 00000010 // +0x00000010
-//@mod 2C 04 10 00 00 00
- 2C 04 10 01 00 00
- // parsed: offset 286, len 6: |0003: const v4, #float nan // #0xffffffff int
- 14 04 FF FF FF FF
- // parsed: offset 292, len 2: |0006: return v4
- 0F 04
- // parsed: offset 294, len 6: |0007: const v4, #float 0.000000 // #0x00000002 int
- 14 04 02 00 00 00
- // parsed: offset 300, len 2: |000a: return v4
- 0F 04
- // parsed: offset 302, len 6: |000b: const v4, #float 0.000000 // #0x00000014 int
- 14 04 14 00 00 00
- // parsed: offset 308, len 2: |000e: return v4
- 0F 04
- // parsed: offset 310, len 2: |000f: nop // spacer
- 00 00
- // parsed: offset 312, len 28: |0010: sparse-switch-data (14 units)
- 00 02 03 00 FF FF FF FF 0A 00 00 00 0F 00 00 00 07 00 00 00 0B 00 00 00 0B 00 00 00
- // tries:
- // handlers:
-// TYPE_LIST
- // parsed: offset 340, len 4: size: 1
- 01 00 00 00
- // parsed: offset 344, len 2: type_item [0] type_idx: 0
- 00 00
-// parsed: offset 346, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 354, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 357, len 4: TYPE_STRING_DATA_ITEM [2] "II"
- 02 49 49 00
-// parsed: offset 361, len 55: TYPE_STRING_DATA_ITEM [3] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_9;"
- 35 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 61 72 73 65 5F 73 77 69 74 63 68 2F 64 2F 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 39 3B 00
-// parsed: offset 416, len 20: TYPE_STRING_DATA_ITEM [4] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 436, len 24: TYPE_STRING_DATA_ITEM [5] "T_sparse_switch_9.java"
- 16 54 5F 73 70 61 72 73 65 5F 73 77 69 74 63 68 5F 39 2E 6A 61 76 61 00
-// parsed: offset 460, len 3: TYPE_STRING_DATA_ITEM [6] "V"
- 01 56 00
-// parsed: offset 463, len 5: TYPE_STRING_DATA_ITEM [7] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sparse_switch/d/T_sparse_switch_9;"
- // parsed: offset 468, len 1: static_fields_size: 0
- 00
- // parsed: offset 469, len 1: instance_fields_size: 0
- 00
- // parsed: offset 470, len 1: direct_methods_size: 1
- 01
- // parsed: offset 471, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 472, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 473, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 476, len 2: code_off: 240 (0x0000f0)
- F0 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 478, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 479, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 480, len 2: code_off: 264 (0x000108)
- 88 02
-// parsed: offset 482, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 484, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 488, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 500, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 512, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 524, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 2
- // offset: 160 (0x0000a0)
- 03 00 00 00 02 00 00 00 A0 00 00 00
- // parsed: offset 536, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 184 (0x0000b8)
- 05 00 00 00 03 00 00 00 B8 00 00 00
- // parsed: offset 548, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 208 (0x0000d0)
- 06 00 00 00 01 00 00 00 D0 00 00 00
- // parsed: offset 560, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 240 (0x0000f0)
- 01 20 00 00 02 00 00 00 F0 00 00 00
- // parsed: offset 572, len 12: [7] type: 0x1001 TYPE_TYPE_LIST
- // unused: 0
- // size: 1
- // offset: 340 (0x000154)
- 01 10 00 00 01 00 00 00 54 01 00 00
- // parsed: offset 584, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 346 (0x00015a)
- 02 20 00 00 08 00 00 00 5A 01 00 00
- // parsed: offset 596, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 468 (0x0001d4)
- 00 20 00 00 01 00 00 00 D4 01 00 00
- // parsed: offset 608, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 484 (0x0001e4)
- 00 10 00 00 01 00 00 00 E4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput/TestStubs.java
deleted file mode 100644
index 581e945..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput;
-
-public class TestStubs {
- // used by testVFE9
- static int TestStubField = 0;
-
- // used by testE5
- public static final int TestStubFieldFinal = 0;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/Test_sput.java b/tools/vm-tests/src/dot/junit/opcodes/sput/Test_sput.java
deleted file mode 100644
index 8b73bb5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/Test_sput.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput.d.T_sput_1;
-import dot.junit.opcodes.sput.d.T_sput_10;
-import dot.junit.opcodes.sput.d.T_sput_11;
-import dot.junit.opcodes.sput.d.T_sput_12;
-import dot.junit.opcodes.sput.d.T_sput_13;
-import dot.junit.opcodes.sput.d.T_sput_14;
-import dot.junit.opcodes.sput.d.T_sput_15;
-import dot.junit.opcodes.sput.d.T_sput_17;
-import dot.junit.opcodes.sput.d.T_sput_19;
-import dot.junit.opcodes.sput.d.T_sput_5;
-import dot.junit.opcodes.sput.d.T_sput_7;
-import dot.junit.opcodes.sput.d.T_sput_8;
-import dot.junit.opcodes.sput.d.T_sput_9;
-
-
-public class Test_sput extends DxTestCase {
-
- /**
- * @title type - int
- */
- public void testN1() {
- T_sput_1 t = new T_sput_1();
- assertEquals(0, T_sput_1.st_i1);
- t.run();
- assertEquals(1000000, T_sput_1.st_i1);
- }
-
- /**
- * @title type - float
- */
- public void testN2() {
- T_sput_19 t = new T_sput_19();
- assertEquals(0.0f, T_sput_19.st_f1);
- t.run();
- assertEquals(3.14f, T_sput_19.st_f1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN3() {
- T_sput_12 t = new T_sput_12();
- assertEquals(0, T_sput_12.st_i1);
- t.run();
- assertEquals(1000000, T_sput_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput.d.T_sput_1
- //@uses dot.junit.opcodes.sput.d.T_sput_14
- T_sput_14 t = new T_sput_14();
- assertEquals(0, T_sput_14.getProtectedField());
- t.run();
- assertEquals(1000000, T_sput_14.getProtectedField());
- }
-
- /**
- * @title Trying to put float into integer field. Dalvik doens't distinguish 32-bits types
- * internally, so this operation makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_sput_5 t = new T_sput_5();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_13 t = new T_sput_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put integer into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify double field
- * with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_sput_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput.TestStubs
- //@uses dot.junit.opcodes.sput.d.T_sput_8
- try {
- new T_sput_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_sput_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_sput_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput.d.T_sput_1
- //@uses dot.junit.opcodes.sput.d.T_sput_15
- try {
- new T_sput_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput shall not work for boolean fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput shall not work for char fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput shall not work for byte fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput.TestStubs
- //@uses dot.junit.opcodes.sput.d.T_sput_11
- try {
- new T_sput_11().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_1.d
deleted file mode 100644
index 748fd1c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_1.java
-.class public dot.junit.opcodes.sput.d.T_sput_1
-.super java/lang/Object
-
-.field public static st_i1 I
-.field protected static st_p1 I
-.field private static st_pvt1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()I
-.limit regs 2
-
- sget v0, dot.junit.opcodes.sput.d.T_sput_1.st_pvt1 I
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_1.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_1.java
deleted file mode 100644
index 3bc4484..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_1 {
- public static int st_i1;
- protected static int st_p1;
- private static int st_pvt1;
-
- public void run() {
- st_i1 = 1000000;
- }
-
- public static int getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_10.d
deleted file mode 100644
index d753fd4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_10.java
-.class public dot.junit.opcodes.sput.d.T_sput_10
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_10.st_i1N I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_10.java
deleted file mode 100644
index 01a9d6b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_11.d
deleted file mode 100644
index 90cc7c0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_11.java
-.class public dot.junit.opcodes.sput.d.T_sput_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.TestStubs.TestStubFieldFinal I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_11.java
deleted file mode 100644
index 1f7ca52..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_12.d
deleted file mode 100644
index 6543443..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_12.java
-.class public dot.junit.opcodes.sput.d.T_sput_12
-.super java/lang/Object
-
-.field public static final st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_12.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_12.java
deleted file mode 100644
index 8e5f7a9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_12 {
- public static int st_i1;
-
- public void run() {
- st_i1 = 1000000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_13.d
deleted file mode 100644
index f6c9d9f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sput.d.StubInitError
-.super java/lang/Object
-
-.field public static value I
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput v1, dot.junit.opcodes.sput.d.StubInitError.value I
- return-void
-.end method
-
-
-.source T_sput_13.java
-.class public dot.junit.opcodes.sput.d.T_sput_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.StubInitError.value I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_13.java
deleted file mode 100644
index 4693899..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_13.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-class StubInitError {
- static int value = 5 / 0;
-}
-
-public class T_sput_13 {
-
- public void run() {
- StubInitError.value = 12;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_14.d
deleted file mode 100644
index 89cab9e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_14.java
-.class public dot.junit.opcodes.sput.d.T_sput_14
-.super dot/junit/opcodes/sput/d/T_sput_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput/d/T_sput_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()I
-.limit regs 2
-
- sget v0, dot.junit.opcodes.sput.d.T_sput_1.st_p1 I
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_1.st_p1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_14.java
deleted file mode 100644
index 102f226..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_14 extends T_sput_1{
-
- public void run() {
- T_sput_1.st_p1 = 1000000;
- }
-
- public static int getProtectedField(){
- return T_sput_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_15.d
deleted file mode 100644
index e2723fe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_15.java
-.class public dot.junit.opcodes.sput.d.T_sput_15
-.super dot/junit/opcodes/sput/d/T_sput_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput/d/T_sput_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 12321
- sput v1, dot.junit.opcodes.sput.d.T_sput_1.st_pvt1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_15.java
deleted file mode 100644
index 25944f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_16.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_16.java
deleted file mode 100644
index 3360d43..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_16.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_16 {
- public static Object o;
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_17.d
deleted file mode 100644
index ce6a0a8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_17.java
-.class public dot.junit.opcodes.sput.d.T_sput_17
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_17.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_17.java
deleted file mode 100644
index c96b5eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_18.d
deleted file mode 100644
index 7a79061..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_18.java
-.class public dot.junit.opcodes.sput.d.T_sput_18
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_19.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_19.d
deleted file mode 100644
index d0f53cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_19.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_19.java
-.class public dot.junit.opcodes.sput.d.T_sput_19
-.super java/lang/Object
-
-.field public static st_f1 F
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 3.14
- sput v1, dot.junit.opcodes.sput.d.T_sput_19.st_f1 F
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_19.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_19.java
deleted file mode 100644
index 854e9fd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_19.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_19 {
- public static float st_f1;
-
-
- public void run() {
- st_f1 = 3.14f;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_2.d
deleted file mode 100644
index 9989c88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_2.java
-.class public dot.junit.opcodes.sput.d.T_sput_2
-.super java/lang/Object
-
-.field public static st_d1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const-wide v1, 1000000.000000
- sput v1, dot.junit.opcodes.sput.d.T_sput_2.st_d1 D
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_20.d
deleted file mode 100644
index 9229d34..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_20.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_20.java
-.class public dot.junit.opcodes.sput.d.T_sput_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v3, 0
- sput v3, dot.junit.opcodes.sput.d.T_sput_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_21.d
deleted file mode 100644
index bc08d1d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_21.java
-.class public dot.junit.opcodes.sput.d.T_sput_21
-.super java/lang/Object
-
-.field public static st_s S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1234
- sput v0, dot.junit.opcodes.sput.d.T_sput_21.st_s S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_22.d
deleted file mode 100644
index ff17473..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_22.java
-.class public dot.junit.opcodes.sput.d.T_sput_22
-.super java/lang/Object
-
-.field public static st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput v0, dot.junit.opcodes.sput.d.T_sput_22.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_23.d
deleted file mode 100644
index 10cdb15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_23.java
-.class public dot.junit.opcodes.sput.d.T_sput_23
-.super java/lang/Object
-
-.field public static st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput v0, dot.junit.opcodes.sput.d.T_sput_23.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_24.d
deleted file mode 100644
index 5b6bac3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_24.java
-.class public dot.junit.opcodes.sput.d.T_sput_24
-.super java/lang/Object
-
-.field public static st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput v0, dot.junit.opcodes.sput.d.T_sput_24.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_3.d
deleted file mode 100644
index 22aaeef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_3.java
-.class public dot.junit.opcodes.sput.d.T_sput_3
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1234
- sput v0, dot.junit.opcodes.sput.d.T_sput_3.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_3.dfh
deleted file mode 100644
index f7d95ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput/d/T_sput_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput/d/T_sput_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 07553f66
- 66 3F 55 07
-// parsed: offset 12, len 20: signature : 2441...71d9
- 24 41 F7 4C E7 A3 98 B5 AC 67 0E F8 6B D1 13 E3 DD 10 71 D9
-// parsed: offset 32, len 4: file_size : 540
- 1C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 404 (0x000194)
- 94 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 304
- 30 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "I"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/sput/d/T_sput_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 336 (0x000150) "Ljava/lang/Object;"
- 50 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 356 (0x000164) "T_sput_3.java"
- 64 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 371 (0x000173) "V"
- 73 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 374 (0x000176) "run"
- 76 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 379 (0x00017b) "st_i1"
- 7B 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "I"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sput/d/T_sput_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sput/d/T_sput_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sput_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 386 (0x000182)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 82 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput.d.T_sput_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput.d.T_sput_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x000004d2 int
- 14 00 D2 04 00 00
- // parsed: offset 282, len 4: |0003: sput v0, Ldot/junit/opcodes/sput/d/T_sput_3;.st_i1:I // field@0000
-//@mod 67 00 00 00
- 67 00 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "I"
- 01 49 00
-// parsed: offset 299, len 37: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sput/d/T_sput_3;"
- 23 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 2F 64 2F 54 5F 73 70 75 74 5F 33 3B 00
-// parsed: offset 336, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 356, len 15: TYPE_STRING_DATA_ITEM [4] "T_sput_3.java"
- 0D 54 5F 73 70 75 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 371, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 374, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 379, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput/d/T_sput_3;"
- // parsed: offset 386, len 1: static_fields_size: 1
- 01
- // parsed: offset 387, len 1: instance_fields_size: 0
- 00
- // parsed: offset 388, len 1: direct_methods_size: 1
- 01
- // parsed: offset 389, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 390, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 391, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 392, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 393, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 396, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 398, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 399, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 400, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 402, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 404, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 408, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 420, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 432, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 444, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 456, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 468, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 480, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 492, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 504, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 516, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 386 (0x000182)
- 00 20 00 00 01 00 00 00 82 01 00 00
- // parsed: offset 528, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 404 (0x000194)
- 00 10 00 00 01 00 00 00 94 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_4.d
deleted file mode 100644
index 2ca3434..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_4.java
-.class public dot.junit.opcodes.sput.d.T_sput_4
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput v3, dot.junit.opcodes.sput.d.T_sput_4.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_5.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_5.d
deleted file mode 100644
index 25a88ba..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_5.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_5.java
-.class public dot.junit.opcodes.sput.d.T_sput_5
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)V
-.limit regs 3
-
- sput v2, dot.junit.opcodes.sput.d.T_sput_5.st_i1 I
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_5.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_5.java
deleted file mode 100644
index 1625283..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_5.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_5 {
- public static int st_i1;
-
- public void run(float f) {
- st_i1 = 1000000;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_7.d
deleted file mode 100644
index 7bad17d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_7.java
-.class public dot.junit.opcodes.sput.d.T_sput_7
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput v1, dot.junit.opcodes.sput.d.T_sput_7.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_7.java
deleted file mode 100644
index 8b22c00..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_8.d
deleted file mode 100644
index f1b1561..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_8.java
-.class public dot.junit.opcodes.sput.d.T_sput_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput v1, dot.junit.opcodes.sput.TestStubs.TestStubField I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_8.java
deleted file mode 100644
index 5ccae38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_9.d
deleted file mode 100644
index 2e4fe0e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_9.java
-.class public dot.junit.opcodes.sput.d.T_sput_9
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput v1, dot.junit.opcodes.sput.d.T_sput_9noclass.st_i1 I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_9.java
deleted file mode 100644
index b8f71e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput/d/T_sput_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput.d;
-
-public class T_sput_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/TestStubs.java
deleted file mode 100644
index c6bbc0b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean;
-
-public class TestStubs {
- // used by testVFE9
- static boolean TestStubField = false;
-
- // used by testE5
- public static final boolean TestStubFieldFinal = false;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
deleted file mode 100644
index f503ec6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_10;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_11;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_12;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_13;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_14;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_15;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_17;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_7;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_8;
-import dot.junit.opcodes.sput_boolean.d.T_sput_boolean_9;
-
-
-public class Test_sput_boolean extends DxTestCase {
-
- /**
- * @title put boolean into static field
- */
- public void testN1() {
- T_sput_boolean_1 t = new T_sput_boolean_1();
- assertEquals(false, T_sput_boolean_1.st_i1);
- t.run();
- assertEquals(true, T_sput_boolean_1.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_sput_boolean_12 t = new T_sput_boolean_12();
- assertEquals(false, T_sput_boolean_12.st_i1);
- t.run();
- assertEquals(true, T_sput_boolean_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_14
- T_sput_boolean_14 t = new T_sput_boolean_14();
- assertEquals(false, T_sput_boolean_14.getProtectedField());
- t.run();
- assertEquals(true, T_sput_boolean_14.getProtectedField());
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_boolean_13 t = new T_sput_boolean_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put boolean into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_boolean_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B13
- * @title put value '2' into boolean field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_sput_boolean_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput_boolean.TestStubs
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_8
- try {
- new T_sput_boolean_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_sput_boolean_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_sput_boolean_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_15
- try {
- new T_sput_boolean_15().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput_boolean shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput_boolean shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput_boolean shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput_boolean shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput_boolean shall not work for char fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput_boolean shall not work for byte fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title Modification of final field in other class.
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput_boolean.TestStubs
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_11
-
- try {
- new T_sput_boolean_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.d
deleted file mode 100644
index 8078d65..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_1.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1
-.super java/lang/Object
-
-.field public static st_i1 Z
-.field protected static st_p1 Z
-.field private static st_pvt1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()Z
-.limit regs 2
-
- sget-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1.st_pvt1 Z
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1.st_i1 Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.java
deleted file mode 100644
index 3e28038..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_1 {
- public static boolean st_i1;
- protected static boolean st_p1;
- private static boolean st_pvt1;
-
- public void run() {
- st_i1 = true;
- }
-
- public static boolean getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.d
deleted file mode 100644
index 672420d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_10.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_10
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_10.st_i1N Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.java
deleted file mode 100644
index 1bb1f7a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.d
deleted file mode 100644
index 796ac2a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_11.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.TestStubs.TestStubFieldFinal Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.java
deleted file mode 100644
index a69a474..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.d
deleted file mode 100644
index d6db6ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_12.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_12
-.super java/lang/Object
-
-.field public static final st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_12.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.java
deleted file mode 100644
index 8721911..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_12 {
- public static boolean st_i1;
-
- public void run() {
- st_i1 = true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_13.d
deleted file mode 100644
index 0f89bc2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sput_boolean.d.StubInitError
-.super java/lang/Object
-
-.field public static value Z
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.StubInitError.value Z
- return-void
-.end method
-
-
-.source T_sput_boolean_13.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.StubInitError.value Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_13.java
deleted file mode 100644
index 20d2977..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_13.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-class StubInitError {
- static boolean value = 5 / 0 > 0 ? true : false;
-}
-
-public class T_sput_boolean_13 {
-
- public void run() {
- StubInitError.value = true;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.d
deleted file mode 100644
index cbaa0e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_14.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_14
-.super dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()Z
-.limit regs 2
-
- sget-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1.st_p1 Z
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1.st_p1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.java
deleted file mode 100644
index 376f60f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_14 extends T_sput_boolean_1{
-
- public void run() {
- T_sput_boolean_1.st_p1 = true;
- }
-
- public static boolean getProtectedField(){
- return T_sput_boolean_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.d
deleted file mode 100644
index 4adc0ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_15.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_15
-.super dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1.st_pvt1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.java
deleted file mode 100644
index 467fc55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.d
deleted file mode 100644
index 53dbe8f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_17.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_17
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_17.st_i1 Z
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.java
deleted file mode 100644
index 5e126b5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_18.d
deleted file mode 100644
index 080e547..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_18.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_18
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_19.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_19.d
deleted file mode 100644
index f7922af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_19.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_19.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_19
-.super java/lang/Object
-
-.field public static st_f1 F
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 3.14
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_19.st_f1 F
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_19.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_19.java
deleted file mode 100644
index 1cf93cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_19.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_19 {
- public static float st_f1;
-
-
- public void run() {
- st_f1 = 3.14f;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_2.d
deleted file mode 100644
index 9e6fe7f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_2.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_2
-.super java/lang/Object
-
-.field public static st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- sput-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_4.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_20.d
deleted file mode 100644
index abc0227..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_20.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_20.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const v3, 0
- sput-boolean v3, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_21.d
deleted file mode 100644
index b1e5f5f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_21.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_21
-.super java/lang/Object
-
-.field public static st_s S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_21.st_s S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_22.d
deleted file mode 100644
index e13f364..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_22.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_22
-.super java/lang/Object
-
-.field public static st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_23.d
deleted file mode 100644
index 9a5ae68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_23.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_23
-.super java/lang/Object
-
-.field public static st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_23.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_24.d
deleted file mode 100644
index 3fe5b45..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_24.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_24
-.super java/lang/Object
-
-.field public static st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_24.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.d
deleted file mode 100644
index 874c5f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_3.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3
-.super java/lang/Object
-
-.field public static st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- sput-boolean v0, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.dfh
deleted file mode 100644
index db54511..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : e7454821
- 21 48 45 E7
-// parsed: offset 12, len 20: signature : 6104...6e2c
- 61 04 5D 28 79 FC E7 CF 89 5A 03 2C 25 BC 80 A4 F5 A3 6E 2C
-// parsed: offset 32, len 4: file_size : 564
- 34 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 428 (0x0001ac)
- AC 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 328
- 48 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 349 (0x00015d) "Ljava/lang/Object;"
- 5D 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 369 (0x000171) "T_sput_boolean_3.java"
- 71 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 392 (0x000188) "V"
- 88 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 395 (0x00018b) "Z"
- 8B 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 398 (0x00018e) "run"
- 8E 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 403 (0x000193) "st_i1"
- 93 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "Z"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 0 (0x000000) type_idx: 3 (0x000003) name_idx: 7 (0x000007) "st_i1"
- 00 00 03 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 00 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_sput_boolean_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 410 (0x00019a)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 9A 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;.st_i1:Z // field@0000
-//@mod 6A 00 00 00
- 6A 00 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 53: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;"
- 33 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 5F 62 6F 6F 6C 65 61 6E 2F 64 2F 54 5F 73 70 75 74 5F 62 6F 6F 6C 65 61 6E 5F 33 3B 00
-// parsed: offset 349, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 369, len 23: TYPE_STRING_DATA_ITEM [3] "T_sput_boolean_3.java"
- 15 54 5F 73 70 75 74 5F 62 6F 6F 6C 65 61 6E 5F 33 2E 6A 61 76 61 00
-// parsed: offset 392, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 395, len 3: TYPE_STRING_DATA_ITEM [5] "Z"
- 01 5A 00
-// parsed: offset 398, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 403, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;"
- // parsed: offset 410, len 1: static_fields_size: 1
- 01
- // parsed: offset 411, len 1: instance_fields_size: 0
- 00
- // parsed: offset 412, len 1: direct_methods_size: 1
- 01
- // parsed: offset 413, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 414, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 415, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 417, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 420, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 422, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 423, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 424, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 426, len 2: PADDING
- 00 00
-// map_list:
- // parsed: offset 428, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 432, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 444, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 456, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 468, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 480, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 492, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 504, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 516, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 528, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 540, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 410 (0x00019a)
- 00 20 00 00 01 00 00 00 9A 01 00 00
- // parsed: offset 552, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 428 (0x0001ac)
- 00 10 00 00 01 00 00 00 AC 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_4.d
deleted file mode 100644
index d0a7422..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_4.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_4
-.super java/lang/Object
-
-.field public static st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-boolean v3, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_4.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_6.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_6.d
deleted file mode 100644
index d50c573..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_6.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_6
-.super java/lang/Object
-
-.field public static s Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v2, 2
- sput-boolean v2, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_6.s Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.d
deleted file mode 100644
index c6b97f0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_7.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_7
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_7.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.java
deleted file mode 100644
index 7a97328..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.d
deleted file mode 100644
index 4b781da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_8.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-boolean v1, dot.junit.opcodes.sput_boolean.TestStubs.TestStubField Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.java
deleted file mode 100644
index 8d738ae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.d
deleted file mode 100644
index 6deddd6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_boolean_9.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_9
-.super java/lang/Object
-
-.field public st_i1 Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-boolean v1, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_9noclass.st_i1 Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.java
deleted file mode 100644
index 6028d28..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_boolean.d;
-
-public class T_sput_boolean_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/TestStubs.java
deleted file mode 100644
index 7b530ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte;
-
-public class TestStubs {
- // used by testVFE9
- static byte TestStubField = 1;
-
- // used by testE5
- public static final byte TestStubFieldFinal = 1;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
deleted file mode 100644
index c64f876..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_1;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_10;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_11;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_12;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_13;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_14;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_15;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_17;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_7;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_8;
-import dot.junit.opcodes.sput_byte.d.T_sput_byte_9;
-
-public class Test_sput_byte extends DxTestCase {
- /**
- * @title put byte into static field
- */
- public void testN1() {
- T_sput_byte_1 t = new T_sput_byte_1();
- assertEquals(0, T_sput_byte_1.st_i1);
- t.run();
- assertEquals(77, T_sput_byte_1.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_sput_byte_12 t = new T_sput_byte_12();
- assertEquals(0, T_sput_byte_12.st_i1);
- t.run();
- assertEquals(77, T_sput_byte_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_1
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_14
- T_sput_byte_14 t = new T_sput_byte_14();
- assertEquals(0, T_sput_byte_14.getProtectedField());
- t.run();
- assertEquals(77, T_sput_byte_14.getProtectedField());
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_byte_13 t = new T_sput_byte_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put byte into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_byte_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B13
- * @title put value '256' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_sput_byte_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput_byte.TestStubs
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_8
- try {
- new T_sput_byte_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_sput_byte_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_sput_byte_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_1
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_15
- try {
- new T_sput_byte_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput-byte shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-byte shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-byte shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-byte shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-byte shall not work for char fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title sput-byte shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput_byte.TestStubs
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_11
- try {
- new T_sput_byte_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.d
deleted file mode 100644
index ec9b61c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_1.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_1
-.super java/lang/Object
-
-.field public static st_i1 B
-.field protected static st_p1 B
-.field private static st_pvt1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()B
-.limit regs 2
-
- sget-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_1.st_pvt1 B
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_1.st_i1 B
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.java
deleted file mode 100644
index 56c52c1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_1 {
- public static byte st_i1;
- protected static byte st_p1;
- private static byte st_pvt1;
-
- public void run() {
- st_i1 = 77;
- }
-
- public static byte getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.d
deleted file mode 100644
index f0a420c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_10.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_10
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_10.st_i1N B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.java
deleted file mode 100644
index 0b49e2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.d
deleted file mode 100644
index 7a3faff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_11.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-byte v1, dot.junit.opcodes.sput_byte.TestStubs.TestStubFieldFinal B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.java
deleted file mode 100644
index 1cf3e6c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.d
deleted file mode 100644
index 41e2aff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_12.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_12
-.super java/lang/Object
-
-.field public static final st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_12.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.java
deleted file mode 100644
index 4e438a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_12 {
- public static byte st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_13.d
deleted file mode 100644
index 2271ca2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sput_byte.d.StubInitError
-.super java/lang/Object
-
-.field public static value B
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput-byte v1, dot.junit.opcodes.sput_byte.d.StubInitError.value B
- return-void
-.end method
-
-
-.source T_sput_byte_13.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-byte v1, dot.junit.opcodes.sput_byte.d.StubInitError.value B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_13.java
deleted file mode 100644
index 5270328..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_13.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-class StubInitError {
- static byte value = (byte)(5 / 0);
-}
-
-public class T_sput_byte_13 {
-
- public void run() {
- StubInitError.value = 11;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.d
deleted file mode 100644
index 1b216a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_14.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_14
-.super dot/junit/opcodes/sput_byte/d/T_sput_byte_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_byte/d/T_sput_byte_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()B
-.limit regs 2
-
- sget-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_1.st_p1 B
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_1.st_p1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.java
deleted file mode 100644
index 67075e7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_14 extends T_sput_byte_1{
-
- public void run() {
- T_sput_byte_1.st_p1 = 77;
- }
-
- public static byte getProtectedField(){
- return T_sput_byte_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.d
deleted file mode 100644
index 8fd5828..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_15.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_15
-.super dot/junit/opcodes/sput_byte/d/T_sput_byte_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_byte/d/T_sput_byte_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_1.st_pvt1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.java
deleted file mode 100644
index c797268..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.d
deleted file mode 100644
index 76bd507..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_17.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_17
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_17.st_i1 B
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.java
deleted file mode 100644
index 4ee32fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_18.d
deleted file mode 100644
index 159ef4d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_18.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_18
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_2.d
deleted file mode 100644
index c9520be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_2.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_2
-.super java/lang/Object
-
-.field public static st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_4.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_20.d
deleted file mode 100644
index 9a77ec6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_20.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-byte v3, dot.junit.opcodes.sput_byte.d.T_sput_byte_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d
deleted file mode 100644
index 15a924b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_21.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_21
-.super java/lang/Object
-
-.field public static st_s I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 12
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_21.st_s I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d
deleted file mode 100644
index 3501490..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_22.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_22
-.super java/lang/Object
-
-.field public static st_b I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_22.st_b I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_23.d
deleted file mode 100644
index a34f665..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_23.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_23
-.super java/lang/Object
-
-.field public static st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_23.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_24.d
deleted file mode 100644
index 07265af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_24.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_24
-.super java/lang/Object
-
-.field public static st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.d
deleted file mode 100644
index 128d14b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_3.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_3
-.super java/lang/Object
-
-.field public static st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_3.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.dfh
deleted file mode 100644
index 86678ff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : e05a4586
- 86 45 5A E0
-// parsed: offset 12, len 20: signature : 90cf...df87
- 90 CF A4 6E C3 FD 39 4D 4D 5C E0 CB 09 2E 87 21 CC F6 DF 87
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "B"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 346 (0x00015a) "Ljava/lang/Object;"
- 5A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 366 (0x00016e) "T_sput_byte_3.java"
- 6E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 386 (0x000182) "V"
- 82 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "run"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 394 (0x00018a) "st_i1"
- 8A 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "B"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sput_byte_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 401 (0x000191)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 91 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput_byte.d.T_sput_byte_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput_byte.d.T_sput_byte_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;.st_i1:B // field@0000
-//@mod 6B 00 00 00
- 6B 00 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "B"
- 01 42 00
-// parsed: offset 299, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 5F 62 79 74 65 2F 64 2F 54 5F 73 70 75 74 5F 62 79 74 65 5F 33 3B 00
-// parsed: offset 346, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [4] "T_sput_byte_3.java"
- 12 54 5F 73 70 75 74 5F 62 79 74 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 386, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 389, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 394, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;"
- // parsed: offset 401, len 1: static_fields_size: 1
- 01
- // parsed: offset 402, len 1: instance_fields_size: 0
- 00
- // parsed: offset 403, len 1: direct_methods_size: 1
- 01
- // parsed: offset 404, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 405, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 406, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 408, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 411, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 413, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 414, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 415, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 417, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 401 (0x000191)
- 00 20 00 00 01 00 00 00 91 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_4.d
deleted file mode 100644
index fc64b62..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_4.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_4
-.super java/lang/Object
-
-.field public static st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-byte v3, dot.junit.opcodes.sput_byte.d.T_sput_byte_4.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_6.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_6.d
deleted file mode 100644
index f41929a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_6.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_6
-.super java/lang/Object
-
-.field public static st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 256
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_6.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.d
deleted file mode 100644
index 8e90c22..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_7.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_7
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_7.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.java
deleted file mode 100644
index 8871136..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.d
deleted file mode 100644
index f4a000f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_8.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-byte v1, dot.junit.opcodes.sput_byte.TestStubs.TestStubField B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.java
deleted file mode 100644
index 0e1605f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.d
deleted file mode 100644
index 59ecb38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_byte_9.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_9
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-byte v1, dot.junit.opcodes.sput_byte.d.T_sput_byte_9noclass.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.java
deleted file mode 100644
index 0262d88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_byte.d;
-
-public class T_sput_byte_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/TestStubs.java
deleted file mode 100644
index fb91f68..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char;
-
-public class TestStubs {
- // used by testVFE9
- static char TestStubField = 1;
-
- // used by testE5
- public static final char TestStubFieldFinal = 1;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/Test_sput_char.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/Test_sput_char.java
deleted file mode 100644
index 120b45a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/Test_sput_char.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput_char.d.T_sput_char_1;
-import dot.junit.opcodes.sput_char.d.T_sput_char_10;
-import dot.junit.opcodes.sput_char.d.T_sput_char_11;
-import dot.junit.opcodes.sput_char.d.T_sput_char_12;
-import dot.junit.opcodes.sput_char.d.T_sput_char_13;
-import dot.junit.opcodes.sput_char.d.T_sput_char_14;
-import dot.junit.opcodes.sput_char.d.T_sput_char_15;
-import dot.junit.opcodes.sput_char.d.T_sput_char_17;
-import dot.junit.opcodes.sput_char.d.T_sput_char_7;
-import dot.junit.opcodes.sput_char.d.T_sput_char_8;
-import dot.junit.opcodes.sput_char.d.T_sput_char_9;
-
-public class Test_sput_char extends DxTestCase {
- /**
- * @title put char into static field
- */
- public void testN1() {
- T_sput_char_1 t = new T_sput_char_1();
- assertEquals(0, T_sput_char_1.st_i1);
- t.run();
- assertEquals(77, T_sput_char_1.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_sput_char_12 t = new T_sput_char_12();
- assertEquals(0, T_sput_char_12.st_i1);
- t.run();
- assertEquals(77, T_sput_char_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_1
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_14
- T_sput_char_14 t = new T_sput_char_14();
- assertEquals(0, T_sput_char_14.getProtectedField());
- t.run();
- assertEquals(77, T_sput_char_14.getProtectedField());
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_char_13 t = new T_sput_char_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put char into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_char_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B13
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_sput_char_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput_char.TestStubs
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_8
- try {
- new T_sput_char_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_sput_char_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_sput_char_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_1
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_15
- try {
- new T_sput_char_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput-char shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-char shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-char shall not work for short fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-char shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-char shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-char shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput_char.TestStubs
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_11
- try {
- new T_sput_char_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.d
deleted file mode 100644
index 8603349..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_1.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_1
-.super java/lang/Object
-
-.field public static st_i1 C
-.field protected static st_p1 C
-.field private static st_pvt1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()C
-.limit regs 2
-
- sget-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_1.st_pvt1 C
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_1.st_i1 C
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.java
deleted file mode 100644
index 0437a31..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_1 {
- public static char st_i1;
- protected static char st_p1;
- private static char st_pvt1;
-
- public void run() {
- st_i1 = 77;
- }
-
- public static char getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.d
deleted file mode 100644
index ff47c26..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_10.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_10
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_10.st_i1N C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.java
deleted file mode 100644
index 10f88f3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.d
deleted file mode 100644
index 6e23f44..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_11.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-char v1, dot.junit.opcodes.sput_char.TestStubs.TestStubFieldFinal C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.java
deleted file mode 100644
index 600cc9d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.d
deleted file mode 100644
index 8cb984f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_12.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_12
-.super java/lang/Object
-
-.field public static final st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_12.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.java
deleted file mode 100644
index cd1f810..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_12 {
- public static char st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_13.d
deleted file mode 100644
index 5b97bc4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sput_char.d.StubInitError
-.super java/lang/Object
-
-.field public static value C
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput-char v1, dot.junit.opcodes.sput_char.d.StubInitError.value C
- return-void
-.end method
-
-
-.source T_sput_char_13.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-char v1, dot.junit.opcodes.sput_char.d.StubInitError.value C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_13.java
deleted file mode 100644
index 786f121..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_13.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-class StubInitError {
- static char value = (char)(5 / 0);
-}
-
-public class T_sput_char_13 {
-
- public void run() {
- StubInitError.value = 11;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.d
deleted file mode 100644
index f682166..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_14.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_14
-.super dot/junit/opcodes/sput_char/d/T_sput_char_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_char/d/T_sput_char_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()C
-.limit regs 2
-
- sget-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_1.st_p1 C
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_1.st_p1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.java
deleted file mode 100644
index 409b51c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_14 extends T_sput_char_1{
-
- public void run() {
- T_sput_char_1.st_p1 = 77;
- }
-
- public static char getProtectedField(){
- return T_sput_char_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.d
deleted file mode 100644
index cccb96b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_15.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_15
-.super dot/junit/opcodes/sput_char/d/T_sput_char_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_char/d/T_sput_char_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_1.st_pvt1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.java
deleted file mode 100644
index 2b4d7d2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.d
deleted file mode 100644
index 22af6be..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_17.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_17
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_17.st_i1 C
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.java
deleted file mode 100644
index 349eaa2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_18.d
deleted file mode 100644
index f1fbeb6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_18.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_18
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_2.d
deleted file mode 100644
index aa5f7d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_2.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_2
-.super java/lang/Object
-
-.field public static st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_4.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_20.d
deleted file mode 100644
index 92d2e6e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_20.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-char v3, dot.junit.opcodes.sput_char.d.T_sput_char_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_21.d
deleted file mode 100644
index bdf6fe3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_21.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_21
-.super java/lang/Object
-
-.field public static st_s S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 12
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_21.st_s S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_22.d
deleted file mode 100644
index fa16663..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_22.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_22
-.super java/lang/Object
-
-.field public static st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_23.d
deleted file mode 100644
index fd69e4f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_23.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_23
-.super java/lang/Object
-
-.field public static st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_24.d
deleted file mode 100644
index 8862e51..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_24.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_24
-.super java/lang/Object
-
-.field public static st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.d
deleted file mode 100644
index ff1725f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_3.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_3
-.super java/lang/Object
-
-.field public static st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_3.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.dfh
deleted file mode 100644
index 45f6af2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_char/d/T_sput_char_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_char/d/T_sput_char_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : bc0b43dc
- DC 43 0B BC
-// parsed: offset 12, len 20: signature : ade8...22aa
- AD E8 8C 2F 92 1D 57 2F 31 A9 89 DE D2 D7 EF 3B 36 0D 22 AA
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "C"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 299 (0x00012b) "Ldot/junit/opcodes/sput_char/d/T_sput_char_3;"
- 2B 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 346 (0x00015a) "Ljava/lang/Object;"
- 5A 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 366 (0x00016e) "T_sput_char_3.java"
- 6E 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 386 (0x000182) "V"
- 82 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 389 (0x000185) "run"
- 85 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 394 (0x00018a) "st_i1"
- 8A 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "C"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sput_char/d/T_sput_char_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sput_char/d/T_sput_char_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sput_char_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 401 (0x000191)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 91 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput_char.d.T_sput_char_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput_char.d.T_sput_char_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_3;.st_i1:C // field@0000
-//@mod 6C 00 00 00
- 6C 00 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 3: TYPE_STRING_DATA_ITEM [1] "C"
- 01 43 00
-// parsed: offset 299, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sput_char/d/T_sput_char_3;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 5F 63 68 61 72 2F 64 2F 54 5F 73 70 75 74 5F 63 68 61 72 5F 33 3B 00
-// parsed: offset 346, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 366, len 20: TYPE_STRING_DATA_ITEM [4] "T_sput_char_3.java"
- 12 54 5F 73 70 75 74 5F 63 68 61 72 5F 33 2E 6A 61 76 61 00
-// parsed: offset 386, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 389, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 394, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput_char/d/T_sput_char_3;"
- // parsed: offset 401, len 1: static_fields_size: 1
- 01
- // parsed: offset 402, len 1: instance_fields_size: 0
- 00
- // parsed: offset 403, len 1: direct_methods_size: 1
- 01
- // parsed: offset 404, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 405, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 406, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 407, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 408, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 411, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 413, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 414, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 415, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 417, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 401 (0x000191)
- 00 20 00 00 01 00 00 00 91 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_4.d
deleted file mode 100644
index 95cf09b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_4.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_4
-.super java/lang/Object
-
-.field public static st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-char v3, dot.junit.opcodes.sput_char.d.T_sput_char_4.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_6.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_6.d
deleted file mode 100644
index a2e504a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_6.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_6
-.super java/lang/Object
-
-.field public static st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_6.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.d
deleted file mode 100644
index 8c44574..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_7.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_7
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_7.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.java
deleted file mode 100644
index 7a496f2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.d
deleted file mode 100644
index ac15f64..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_8.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-char v1, dot.junit.opcodes.sput_char.TestStubs.TestStubField C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.java
deleted file mode 100644
index c4a3e38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.d
deleted file mode 100644
index 74279c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_char_9.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_9
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-char v1, dot.junit.opcodes.sput_char.d.T_sput_char_9noclass.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.java
deleted file mode 100644
index c38e18c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_char.d;
-
-public class T_sput_char_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/TestStubs.java
deleted file mode 100644
index 701ece3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object;
-
-public class TestStubs {
- // used by testVFE9
- static Object TestStubField = null;
-
- // used by testE5
- public static final Object TestStubFieldFinal = null;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/Test_sput_object.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/Test_sput_object.java
deleted file mode 100644
index cd070a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/Test_sput_object.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput_object.d.T_sput_object_1;
-import dot.junit.opcodes.sput_object.d.T_sput_object_10;
-import dot.junit.opcodes.sput_object.d.T_sput_object_11;
-import dot.junit.opcodes.sput_object.d.T_sput_object_12;
-import dot.junit.opcodes.sput_object.d.T_sput_object_13;
-import dot.junit.opcodes.sput_object.d.T_sput_object_14;
-import dot.junit.opcodes.sput_object.d.T_sput_object_15;
-import dot.junit.opcodes.sput_object.d.T_sput_object_17;
-import dot.junit.opcodes.sput_object.d.T_sput_object_7;
-import dot.junit.opcodes.sput_object.d.T_sput_object_8;
-import dot.junit.opcodes.sput_object.d.T_sput_object_9;
-
-public class Test_sput_object extends DxTestCase {
- /**
- * @title put reference into static field
- */
- public void testN1() {
- T_sput_object_1 t = new T_sput_object_1();
- assertEquals(null, T_sput_object_1.st_i1);
- t.run();
- assertEquals(t, T_sput_object_1.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_sput_object_12 t = new T_sput_object_12();
- assertEquals(null, T_sput_object_12.st_i1);
- t.run();
- assertEquals(t, T_sput_object_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_1
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_14
- T_sput_object_14 t = new T_sput_object_14();
- assertEquals(null, T_sput_object_14.getProtectedField());
- t.run();
- assertEquals(t, T_sput_object_14.getProtectedField());
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_object_13 t = new T_sput_object_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put object into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_object_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_sput_object_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput_object.TestStubs
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_8
- try {
- new T_sput_object_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_sput_object_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_sput_object_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_1
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_15
- try {
- new T_sput_object_15().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput-object shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title assignment incompatible references
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-object shall not work for char fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-object shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-object shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-object shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-object shall not work for short fields
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput_object.TestStubs
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_11
- try {
- new T_sput_object_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_1.d
deleted file mode 100644
index acb4903..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_1.d
+++ /dev/null
@@ -1,45 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_1.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_1
-.super java/lang/Object
-
-.field public static st_i1 Ljava/lang/Object;
-.field protected static st_p1 Ljava/lang/Object;
-.field private static st_pvt1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()Ljava/lang/Object;
-.limit regs 2
-
- sget-object v0, dot.junit.opcodes.sput_object.d.T_sput_object_1.st_pvt1 Ljava/lang/Object;
- return-object v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_1.st_i1 Ljava/lang/Object;
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_1.java
deleted file mode 100644
index 1bf8e5c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_1 {
- public static Object st_i1;
- protected static Object st_p1;
- private static Object st_pvt1;
-
- public void run() {
- st_i1 = this;
- }
-
- public static Object getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_10.d
deleted file mode 100644
index 7f12b99..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_10.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_10
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_10.st_i1N Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_10.java
deleted file mode 100644
index bbc15c5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.d
deleted file mode 100644
index a09c4af..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_11.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.TestStubs.TestStubFieldFinal Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.java
deleted file mode 100644
index 7f90df0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_12.d
deleted file mode 100644
index 562d8ed..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_12.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_12.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_12
-.super java/lang/Object
-
-.field public static final st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_12.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_12.java
deleted file mode 100644
index 5a592c3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_12 {
- public static Object st_i1;
-
- public void run() {
- st_i1 = this;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_13.d
deleted file mode 100644
index d2d59da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sput_object.d.StubInitError
-.super java/lang/Object
-
-.field public static t I
-.field public static value Ljava/lang/Object;
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput v1, dot.junit.opcodes.sput_object.d.StubInitError.t I
- return-void
-.end method
-
-
-.source T_sput_object_13.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.StubInitError.value Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_13.java
deleted file mode 100644
index 9e16873..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_13.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-class StubInitError {
- static short t = (short)(5 / 0);
- static Object value;
-}
-
-public class T_sput_object_13 {
-
- public void run() {
- StubInitError.value = this;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.d
deleted file mode 100644
index 89ed274..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.d
+++ /dev/null
@@ -1,41 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_14.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_14
-.super dot/junit/opcodes/sput_object/d/T_sput_object_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_object/d/T_sput_object_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()Ljava/lang/Object;
-.limit regs 2
-
- sget-object v0, dot.junit.opcodes.sput_object.d.T_sput_object_1.st_p1 Ljava/lang/Object;
- return-object v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_1.st_p1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.java
deleted file mode 100644
index 87ea8fb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_14 extends T_sput_object_1{
-
- public void run() {
- T_sput_object_1.st_p1 = this;
- }
-
- public static Object getProtectedField(){
- return T_sput_object_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.d
deleted file mode 100644
index 61d48e2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_15.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_15
-.super dot/junit/opcodes/sput_object/d/T_sput_object_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_object/d/T_sput_object_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_1.st_pvt1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.java
deleted file mode 100644
index 676e4c3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.d
deleted file mode 100644
index b46acdf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_17.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_17
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_17.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.java
deleted file mode 100644
index 6f7ad7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_18.d
deleted file mode 100644
index 21c4c5f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_18.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_18.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_18
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_2.d
deleted file mode 100644
index 5b6c088..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_2.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_2
-.super java/lang/Object
-
-.field public static st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1234
- sput-object v0, dot.junit.opcodes.sput_object.d.T_sput_object_2.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_20.d
deleted file mode 100644
index 8d6c9df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_20.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/String;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_20.st_o Ljava/lang/String;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_21.d
deleted file mode 100644
index f09c1a9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_21.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_21
-.super java/lang/Object
-
-.field public static st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_21.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_22.d
deleted file mode 100644
index 4ae60e2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_22.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_22
-.super java/lang/Object
-
-.field public static st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_23.d
deleted file mode 100644
index b440bb4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_23.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_23
-.super java/lang/Object
-
-.field public static st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_24.d
deleted file mode 100644
index 63a01e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_24.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_24
-.super java/lang/Object
-
-.field public static st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_3.d
deleted file mode 100644
index 080efbc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_3.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_3
-.super java/lang/Object
-
-.field public static st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_3.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_3.dfh
deleted file mode 100644
index 90b5887..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_3.dfh
+++ /dev/null
@@ -1,253 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_object/d/T_sput_object_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_object/d/T_sput_object_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : c2134499
- 99 44 13 C2
-// parsed: offset 12, len 20: signature : ef04...607d
- EF 04 C2 97 17 79 3D 72 CF 34 E1 02 0C 5F 88 73 55 DF 60 7D
-// parsed: offset 32, len 4: file_size : 544
- 20 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 408 (0x000198)
- 98 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 7
- 07 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 140 (0x00008c)
- 8C 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 152 (0x000098)
- 98 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 164 (0x0000a4)
- A4 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 196 (0x0000c4)
- C4 00 00 00
-// parsed: offset 104, len 4: data_size : 316
- 3C 01 00 00
-// parsed: offset 108, len 4: data_off : 228 (0x0000e4)
- E4 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 276 (0x000114) "<init>"
- 14 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 284 (0x00011c) "Ldot/junit/opcodes/sput_object/d/T_sput_object_3;"
- 1C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 335 (0x00014f) "Ljava/lang/Object;"
- 4F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 355 (0x000163) "T_sput_object_3.java"
- 63 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 377 (0x000179) "V"
- 79 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 380 (0x00017c) "run"
- 7C 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 385 (0x000181) "st_i1"
- 81 01 00 00
-
-// type_ids:
-// parsed: offset 140, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/sput_object/d/T_sput_object_3;"
- 01 00 00 00
-// parsed: offset 144, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 148, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 152, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 164, len 8: [0] class_idx: 0 (0x000000) type_idx: 1 (0x000001) name_idx: 6 (0x000006) "st_i1"
- 00 00 01 00 06 00 00 00
-
-// methods_ids:
-// parsed: offset 172, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 180, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 188, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 196, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/sput_object/d/T_sput_object_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_sput_object_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 392 (0x000188)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 88 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput_object.d.T_sput_object_3.<init>"
- // parsed: offset 228, len 2: registers_size: 1
- 01 00
- // parsed: offset 230, len 2: ins_size: 1
- 01 00
- // parsed: offset 232, len 2: outs_size: 1
- 01 00
- // parsed: offset 234, len 2: tries_size: 0
- 00 00
- // parsed: offset 236, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 240, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 244, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 250, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput_object.d.T_sput_object_3.run"
- // parsed: offset 252, len 2: registers_size: 3
- 03 00
- // parsed: offset 254, len 2: ins_size: 1
- 01 00
- // parsed: offset 256, len 2: outs_size: 0
- 00 00
- // parsed: offset 258, len 2: tries_size: 0
- 00 00
- // parsed: offset 260, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 264, len 4: insns_size: 3
- 03 00 00 00
- // insns:
- // parsed: offset 268, len 4: |0000: sput-object v2, Ldot/junit/opcodes/sput_object/d/T_sput_object_3;.st_i1:Ljava/lang/Object; // field@0000
-//@mod 69 02 00 00
- 69 02 00 01
- // parsed: offset 272, len 2: |0002: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 274, len 2: PADDING
- 00 00
-// parsed: offset 276, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 284, len 51: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/sput_object/d/T_sput_object_3;"
- 31 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 5F 6F 62 6A 65 63 74 2F 64 2F 54 5F 73 70 75 74 5F 6F 62 6A 65 63 74 5F 33 3B 00
-// parsed: offset 335, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 355, len 22: TYPE_STRING_DATA_ITEM [3] "T_sput_object_3.java"
- 14 54 5F 73 70 75 74 5F 6F 62 6A 65 63 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 377, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 380, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// parsed: offset 385, len 7: TYPE_STRING_DATA_ITEM [6] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput_object/d/T_sput_object_3;"
- // parsed: offset 392, len 1: static_fields_size: 1
- 01
- // parsed: offset 393, len 1: instance_fields_size: 0
- 00
- // parsed: offset 394, len 1: direct_methods_size: 1
- 01
- // parsed: offset 395, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 396, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 397, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 398, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 399, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 402, len 2: code_off: 228 (0x0000e4)
- E4 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 404, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 405, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 406, len 2: code_off: 252 (0x0000fc)
- FC 01
-// map_list:
- // parsed: offset 408, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 412, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 424, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 7
- // offset: 112 (0x000070)
- 01 00 00 00 07 00 00 00 70 00 00 00
- // parsed: offset 436, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 140 (0x00008c)
- 02 00 00 00 03 00 00 00 8C 00 00 00
- // parsed: offset 448, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 152 (0x000098)
- 03 00 00 00 01 00 00 00 98 00 00 00
- // parsed: offset 460, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 164 (0x0000a4)
- 04 00 00 00 01 00 00 00 A4 00 00 00
- // parsed: offset 472, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 172 (0x0000ac)
- 05 00 00 00 03 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 196 (0x0000c4)
- 06 00 00 00 01 00 00 00 C4 00 00 00
- // parsed: offset 496, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 228 (0x0000e4)
- 01 20 00 00 02 00 00 00 E4 00 00 00
- // parsed: offset 508, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 7
- // offset: 276 (0x000114)
- 02 20 00 00 07 00 00 00 14 01 00 00
- // parsed: offset 520, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 392 (0x000188)
- 00 20 00 00 01 00 00 00 88 01 00 00
- // parsed: offset 532, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 408 (0x000198)
- 00 10 00 00 01 00 00 00 98 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_4.d
deleted file mode 100644
index 3a3bccd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_4.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_4
-.super java/lang/Object
-
-.field public static st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_4.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_6.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_6.d
deleted file mode 100644
index b43597a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_6.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_6.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_6
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v3, dot.junit.opcodes.sput_object.d.T_sput_object_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_7.d
deleted file mode 100644
index 84988f9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_7.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_7.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_7
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_7.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_7.java
deleted file mode 100644
index 0e5f873..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.d
deleted file mode 100644
index 26495a1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_8.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.TestStubs.TestStubField Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.java
deleted file mode 100644
index d3d7408..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_9.d
deleted file mode 100644
index 2d35cf1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_9.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_object_9.java
-.class public dot.junit.opcodes.sput_object.d.T_sput_object_9
-.super java/lang/Object
-
-.field public st_i1 Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-object v2, dot.junit.opcodes.sput_object.d.T_sput_object_9noclass.st_i1 Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_9.java
deleted file mode 100644
index bef9d16..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_object/d/T_sput_object_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_object.d;
-
-public class T_sput_object_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/TestStubs.java
deleted file mode 100644
index dd67611..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short;
-
-public class TestStubs {
- // used by testVFE9
- static short TestStubField = 1;
-
- // used by testE5
- public static final short TestStubFieldFinal = 1;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/Test_sput_short.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/Test_sput_short.java
deleted file mode 100644
index f14c4a7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/Test_sput_short.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput_short.d.T_sput_short_1;
-import dot.junit.opcodes.sput_short.d.T_sput_short_10;
-import dot.junit.opcodes.sput_short.d.T_sput_short_11;
-import dot.junit.opcodes.sput_short.d.T_sput_short_12;
-import dot.junit.opcodes.sput_short.d.T_sput_short_13;
-import dot.junit.opcodes.sput_short.d.T_sput_short_14;
-import dot.junit.opcodes.sput_short.d.T_sput_short_15;
-import dot.junit.opcodes.sput_short.d.T_sput_short_17;
-import dot.junit.opcodes.sput_short.d.T_sput_short_7;
-import dot.junit.opcodes.sput_short.d.T_sput_short_8;
-import dot.junit.opcodes.sput_short.d.T_sput_short_9;
-
-public class Test_sput_short extends DxTestCase {
- /**
- * @title put short into static field
- */
- public void testN1() {
- T_sput_short_1 t = new T_sput_short_1();
- assertEquals(0, T_sput_short_1.st_i1);
- t.run();
- assertEquals(77, T_sput_short_1.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN2() {
- T_sput_short_12 t = new T_sput_short_12();
- assertEquals(0, T_sput_short_12.st_i1);
- t.run();
- assertEquals(77, T_sput_short_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_1
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_14
- T_sput_short_14 t = new T_sput_short_14();
- assertEquals(0, T_sput_short_14.getProtectedField());
- t.run();
- assertEquals(77, T_sput_short_14.getProtectedField());
- }
-
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_short_13 t = new T_sput_short_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put short into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_short_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
- /**
- *
- * @constraint B13
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify double
- * field with single-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.
- */
- public void testVFE8() {
- try {
- new T_sput_short_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput_short.TestStubs
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_8
- try {
- new T_sput_short_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class.
- */
- public void testVFE10() {
- try {
- new T_sput_short_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field.
- */
- public void testVFE11() {
- try {
- new T_sput_short_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_1
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_15
- try {
- new T_sput_short_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput-short shall not work for wide numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-short shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-short shall not work for char fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-short shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-short shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-short shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput_short.TestStubs
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_11
- try {
- new T_sput_short_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.d
deleted file mode 100644
index f41be35..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_1.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_1
-.super java/lang/Object
-
-.field public static st_i1 S
-.field protected static st_p1 S
-.field private static st_pvt1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()S
-.limit regs 2
-
- sget-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_1.st_pvt1 S
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_1.st_i1 S
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.java
deleted file mode 100644
index c2d792d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_1 {
- public static short st_i1;
- protected static short st_p1;
- private static short st_pvt1;
-
- public void run() {
- st_i1 = 77;
- }
-
- public static short getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.d
deleted file mode 100644
index 10a12b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_10.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_10
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_10.st_i1N S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.java
deleted file mode 100644
index 3af3f04..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.d
deleted file mode 100644
index 4351376..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_11.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-short v1, dot.junit.opcodes.sput_short.TestStubs.TestStubFieldFinal S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.java
deleted file mode 100644
index 15f6124..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.d
deleted file mode 100644
index a9dbbb0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_12.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_12
-.super java/lang/Object
-
-.field public static final st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_12.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.java
deleted file mode 100644
index f6edd67..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_12 {
- public static short st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_13.d
deleted file mode 100644
index 55d0bf5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source StubInitError.java
-.class public dot.junit.opcodes.sput_short.d.StubInitError
-.super java/lang/Object
-
-.field public static value S
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput-short v1, dot.junit.opcodes.sput_short.d.StubInitError.value S
- return-void
-.end method
-
-
-.source T_sput_short_13.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-short v1, dot.junit.opcodes.sput_short.d.StubInitError.value S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_13.java
deleted file mode 100644
index 3750c17..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_13.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-class StubInitError {
- static short value = (short)(5 / 0);
-}
-
-public class T_sput_short_13 {
-
- public void run() {
- StubInitError.value = 11;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.d
deleted file mode 100644
index a836771..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_14.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_14
-.super dot/junit/opcodes/sput_short/d/T_sput_short_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_short/d/T_sput_short_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()S
-.limit regs 2
-
- sget-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_1.st_p1 S
- return v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 77
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_1.st_p1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.java
deleted file mode 100644
index 2aa5061..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_14 extends T_sput_short_1{
-
- public void run() {
- T_sput_short_1.st_p1 = 77;
- }
-
- public static short getProtectedField(){
- return T_sput_short_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.d
deleted file mode 100644
index 4848a3f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_15.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_15
-.super dot/junit/opcodes/sput_short/d/T_sput_short_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_short/d/T_sput_short_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const/16 v1, 1
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_1.st_pvt1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.java
deleted file mode 100644
index 04f6a7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.d
deleted file mode 100644
index 3aba6fb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_17.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_17
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_17.st_i1 S
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.java
deleted file mode 100644
index fa56416..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_18.d
deleted file mode 100644
index e1ef12c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_18.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_18
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_18.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_2.d
deleted file mode 100644
index f6c1a55..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_2.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_2
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_4.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_20.d
deleted file mode 100644
index dc42d54..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_20.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-short v3, dot.junit.opcodes.sput_short.d.T_sput_short_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_21.d
deleted file mode 100644
index a55af0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_21.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_21
-.super java/lang/Object
-
-.field public static st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 12
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_21.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_22.d
deleted file mode 100644
index 25375e2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_22.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_22
-.super java/lang/Object
-
-.field public static st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_23.d
deleted file mode 100644
index fc437cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_23.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_23
-.super java/lang/Object
-
-.field public static st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_24.d
deleted file mode 100644
index 16b16f1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_24.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_24
-.super java/lang/Object
-
-.field public static st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const v0, 1
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.d
deleted file mode 100644
index 1246f9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_3.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_3
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_3.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.dfh
deleted file mode 100644
index ac6f1b7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.dfh
+++ /dev/null
@@ -1,259 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_short/d/T_sput_short_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_short/d/T_sput_short_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 6a84455e
- 5E 45 84 6A
-// parsed: offset 12, len 20: signature : 2f3c...2c3e
- 2F 3C 42 F3 69 37 32 D5 2E D5 95 0C 52 19 F8 FB EA 75 2C 3E
-// parsed: offset 32, len 4: file_size : 556
- 2C 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 420 (0x0001a4)
- A4 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 320
- 40 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 288 (0x000120) "<init>"
- 20 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 296 (0x000128) "Ldot/junit/opcodes/sput_short/d/T_sput_short_3;"
- 28 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 345 (0x000159) "Ljava/lang/Object;"
- 59 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 365 (0x00016d) "S"
- 6D 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 368 (0x000170) "T_sput_short_3.java"
- 70 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 389 (0x000185) "V"
- 85 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 392 (0x000188) "run"
- 88 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 397 (0x00018d) "st_i1"
- 8D 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/opcodes/sput_short/d/T_sput_short_3;"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "S"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 0 (0x000000) type_idx: 2 (0x000002) name_idx: 7 (0x000007) "st_i1"
- 00 00 02 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 00 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/opcodes/sput_short/d/T_sput_short_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sput_short_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 404 (0x000194)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 94 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput_short.d.T_sput_short_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput_short.d.T_sput_short_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 6
- 06 00 00 00
- // insns:
- // parsed: offset 276, len 6: |0000: const v0, #float 0.000000 // #0x00000001 int
- 14 00 01 00 00 00
- // parsed: offset 282, len 4: |0003: sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_3;.st_i1:S // field@0000
-//@mod 6D 00 00 00
- 6D 00 00 01
- // parsed: offset 286, len 2: |0005: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 288, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 296, len 49: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/opcodes/sput_short/d/T_sput_short_3;"
- 2F 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 5F 73 68 6F 72 74 2F 64 2F 54 5F 73 70 75 74 5F 73 68 6F 72 74 5F 33 3B 00
-// parsed: offset 345, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 365, len 3: TYPE_STRING_DATA_ITEM [3] "S"
- 01 53 00
-// parsed: offset 368, len 21: TYPE_STRING_DATA_ITEM [4] "T_sput_short_3.java"
- 13 54 5F 73 70 75 74 5F 73 68 6F 72 74 5F 33 2E 6A 61 76 61 00
-// parsed: offset 389, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 392, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 397, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput_short/d/T_sput_short_3;"
- // parsed: offset 404, len 1: static_fields_size: 1
- 01
- // parsed: offset 405, len 1: instance_fields_size: 0
- 00
- // parsed: offset 406, len 1: direct_methods_size: 1
- 01
- // parsed: offset 407, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 408, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 409, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 410, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 411, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 414, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 416, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 417, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 418, len 2: code_off: 260 (0x000104)
- 84 02
-// map_list:
- // parsed: offset 420, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 424, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 436, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 448, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 460, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 472, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 484, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 496, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 508, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 520, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 288 (0x000120)
- 02 20 00 00 08 00 00 00 20 01 00 00
- // parsed: offset 532, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 404 (0x000194)
- 00 20 00 00 01 00 00 00 94 01 00 00
- // parsed: offset 544, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 420 (0x0001a4)
- 00 10 00 00 01 00 00 00 A4 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_4.d
deleted file mode 100644
index df600da..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_4.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_4
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-short v3, dot.junit.opcodes.sput_short.d.T_sput_short_4.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_6.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_6.d
deleted file mode 100644
index 1b3904f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_6.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_6
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.d
deleted file mode 100644
index 99d2bc6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_7.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_7
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_7.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.java
deleted file mode 100644
index cbecc44..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.d
deleted file mode 100644
index ce24cf8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_8.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-short v1, dot.junit.opcodes.sput_short.TestStubs.TestStubField S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.java
deleted file mode 100644
index 852263e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.d
deleted file mode 100644
index d5aa82f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_short_9.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_9
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 0
- sput-short v1, dot.junit.opcodes.sput_short.d.T_sput_short_9noclass.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.java
deleted file mode 100644
index e950c1d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_short.d;
-
-public class T_sput_short_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/TestStubs.java
deleted file mode 100644
index bc99fda..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/TestStubs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide;
-
-public class TestStubs {
- // used by testVFE9
- static long TestStubField = 1;
-
- // used by testE5
- public static final long TestStubFieldFinal = 1;
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java
deleted file mode 100644
index 29ff21b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_1;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_10;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_11;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_12;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_13;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_14;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_15;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_17;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_5;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_7;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_8;
-import dot.junit.opcodes.sput_wide.d.T_sput_wide_9;
-
-public class Test_sput_wide extends DxTestCase {
- /**
- * @title put long into static field
- */
- public void testN1() {
- T_sput_wide_1 t = new T_sput_wide_1();
- assertEquals(0, T_sput_wide_1.st_i1);
- t.run();
- assertEquals(778899112233l, T_sput_wide_1.st_i1);
- }
-
- /**
- * @title put double into static field
- */
- public void testN2() {
- T_sput_wide_5 t = new T_sput_wide_5();
- assertEquals(0.0d, T_sput_wide_5.st_i1);
- t.run();
- assertEquals(0.5d, T_sput_wide_5.st_i1);
- }
-
-
- /**
- * @title modification of final field
- */
- public void testN3() {
- T_sput_wide_12 t = new T_sput_wide_12();
- assertEquals(0, T_sput_wide_12.st_i1);
- t.run();
- assertEquals(77, T_sput_wide_12.st_i1);
- }
-
- /**
- * @title modification of protected field from subclass
- */
- public void testN4() {
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_1
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_14
- T_sput_wide_14 t = new T_sput_wide_14();
- assertEquals(0, T_sput_wide_14.getProtectedField());
- t.run();
- assertEquals(77, T_sput_wide_14.getProtectedField());
- }
-
- /**
- * @title initialization of referenced class throws exception
- */
- public void testE6() {
- T_sput_wide_13 t = new T_sput_wide_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
- }
-
- /**
- * @constraint A12
- * @title constant pool index
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A23
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- *
- * @constraint B13
- * @title put int into long field - only field with same name but
- * different type exists
- */
- public void testVFE5() {
- try {
- new T_sput_wide_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- *
- * @constraint B13
- * @title type of field doesn't match opcode - attempt to modify float
- * field with double-width register
- */
- public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint A12
- * @title Attempt to set non-static field.Dalvik throws IncompatibleClassChangeError when
- * executing the code.
- */
- public void testVFE8() {
- try {
- new T_sput_wide_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify inaccessible field. Dalvik throws IllegalAccessError when executing
- * the code.
- */
- public void testVFE9() {
- //@uses dot.junit.opcodes.sput_wide.TestStubs
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_8
- try {
- new T_sput_wide_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify field of undefined class. Dalvik throws NoClassDefFoundError when
- * executing the code.
- */
- public void testVFE10() {
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_9
- try {
- new T_sput_wide_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
- }
-
- /**
- * @constraint n/a
- * @title Attempt to modify undefined field. Dalvik throws NoSuchFieldError when executing the
- * code.
- */
- public void testVFE11() {
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_10
- try {
- new T_sput_wide_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
- }
-
-
-
- /**
- * @constraint n/a
- * @title Attempt to modify superclass' private field from subclass. Dalvik throws
- * IllegalAccessError when executing the code.
- */
- public void testVFE12() {
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_1
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_15
- try {
- new T_sput_wide_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint B1
- * @title sput-wide shall not work for single-width numbers
- */
- public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-wide shall not work for reference fields
- */
- public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-wide shall not work for char fields
- */
- public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-wide shall not work for int fields
- */
- public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-wide shall not work for byte fields
- */
- public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-wide shall not work for boolean fields
- */
- public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title sput-wide shall not work for short fields
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint n/a
- * @title Modification of final field in other class
- */
- public void testVFE19() {
- //@uses dot.junit.opcodes.sput_wide.TestStubs
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_11
- try {
- new T_sput_wide_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_1.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_1.d
deleted file mode 100644
index 94e2898..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_1.d
+++ /dev/null
@@ -1,46 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_1.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_1
-.super java/lang/Object
-
-.field public static st_i1 J
-.field protected static st_p1 J
-.field private static st_pvt1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public static getPvtField()J
-.limit regs 2
-
- sget-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_1.st_pvt1 J
- return-wide v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 778899112233
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_1.st_i1 J
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_1.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_1.java
deleted file mode 100644
index 422b3c9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_1 {
- public static long st_i1;
- protected static long st_p1;
- private static long st_pvt1;
-
- public void run() {
- st_i1 = 778899112233l;
- }
-
- public static long getPvtField()
- {
- return st_pvt1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.d
deleted file mode 100644
index 65a6012..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_10.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_10
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 1
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_10.st_i1N J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.java
deleted file mode 100644
index b275744..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_10 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.d
deleted file mode 100644
index 7cf07a0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_11.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_11
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 1
- sput-wide v1, dot.junit.opcodes.sput_wide.TestStubs.TestStubFieldFinal J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.java
deleted file mode 100644
index c458f05..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_11 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.d
deleted file mode 100644
index 23fc53b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_12.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_12
-.super java/lang/Object
-
-.field public static final st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 77
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_12.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.java
deleted file mode 100644
index 3f0f128..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_12 {
- public static long st_i1;
-
- public void run() {
- st_i1 = 77;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d
deleted file mode 100644
index a130809..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d
+++ /dev/null
@@ -1,53 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source JtubInitError.java
-.class public dot.junit.opcodes.sput_wide.d.JtubInitError
-.super java/lang/Object
-
-.field public static value J
-
-.method static <clinit>()V
-.limit regs 2
-
- const/4 v0, 0
- const/4 v1, 5
- div-int/2addr v1, v0
-
- sput-wide v1, dot.junit.opcodes.sput_wide.d.JtubInitError.value J
- return-void
-.end method
-
-
-.source T_sput_wide_13.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_13
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 1
- sput-wide v1, dot.junit.opcodes.sput_wide.d.JtubInitError.value J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.java
deleted file mode 100644
index ab71754..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-class StubInitError {
- static long value = (long)(5 / 0);
-}
-
-public class T_sput_wide_13 {
-
- public void run() {
- StubInitError.value = 11;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.d
deleted file mode 100644
index 38d5ed5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.d
+++ /dev/null
@@ -1,42 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_14.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_14
-.super dot/junit/opcodes/sput_wide/d/T_sput_wide_1
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_wide/d/T_sput_wide_1/<init>()V
- return-void
-.end method
-
-.method public static getProtectedField()J
-.limit regs 2
-
- sget-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_1.st_p1 J
- return-wide v0
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 77
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_1.st_p1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.java
deleted file mode 100644
index c919ee5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_14 extends T_sput_wide_1{
-
- public void run() {
- T_sput_wide_1.st_p1 = 77;
- }
-
- public static long getProtectedField(){
- return T_sput_wide_1.st_p1;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.d
deleted file mode 100644
index 88531b4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_15.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_15
-.super dot/junit/opcodes/sput_wide/d/T_sput_wide_1
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, dot/junit/opcodes/sput_wide/d/T_sput_wide_1/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 1
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_1.st_pvt1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.java
deleted file mode 100644
index 376cdd8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_15 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.d
deleted file mode 100644
index ab57cb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_17.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_17
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 1
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_17.st_i1 J
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.java
deleted file mode 100644
index 244fa5e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_17 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_18.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_18.d
deleted file mode 100644
index 463bdbd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_18.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_18.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_18
-.super java/lang/Object
-
-.field public static st_i1 F
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v1, 1.0
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_18.st_i1 F
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_2.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_2.d
deleted file mode 100644
index 84b5622..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_2.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_2
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 1
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_4.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_20.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_20.d
deleted file mode 100644
index ca43933..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_20.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_20.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_20
-.super java/lang/Object
-
-.field public static st_o Ljava/lang/Object;
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- sput-wide v3, dot.junit.opcodes.sput_wide.d.T_sput_wide_20.st_o Ljava/lang/Object;
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_21.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_21.d
deleted file mode 100644
index 04cf574..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_21.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_21.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_21
-.super java/lang/Object
-
-.field public static st_c C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 12
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_21.st_c C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_22.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_22.d
deleted file mode 100644
index d89d3cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_22.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_22.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_22
-.super java/lang/Object
-
-.field public static st_i I
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 1
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_22.st_i I
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_23.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_23.d
deleted file mode 100644
index da254f8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_23.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_23.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_23
-.super java/lang/Object
-
-.field public static st_b B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 1
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_23.st_b B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_24.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_24.d
deleted file mode 100644
index e663946..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_24.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_24.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_24
-.super java/lang/Object
-
-.field public static st_z Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
- const-wide v0, 1
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_24.st_z Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.d
deleted file mode 100644
index 344db70..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_3.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_3
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_3.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.dfh b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.dfh
deleted file mode 100644
index 4236b7c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.dfh
+++ /dev/null
@@ -1,261 +0,0 @@
-// Processing 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.dex'...
-// Opened 'dalvik-opcodes/out/classes_dasm/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 91f343d1
- D1 43 F3 91
-// parsed: offset 12, len 20: signature : 659a...c933
- 65 9A 3C 32 A2 38 1F 9A AB B7 C9 11 22 6C 75 97 DF 86 C9 33
-// parsed: offset 32, len 4: file_size : 560
- 30 02 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 424 (0x0001a8)
- A8 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 8
- 08 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 4
- 04 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 144 (0x000090)
- 90 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 1
- 01 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 172 (0x0000ac)
- AC 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 180 (0x0000b4)
- B4 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 204 (0x0000cc)
- CC 00 00 00
-// parsed: offset 104, len 4: data_size : 324
- 44 01 00 00
-// parsed: offset 108, len 4: data_off : 236 (0x0000ec)
- EC 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 292 (0x000124) "<init>"
- 24 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 300 (0x00012c) "J"
- 2C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 303 (0x00012f) "Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;"
- 2F 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 350 (0x00015e) "Ljava/lang/Object;"
- 5E 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 370 (0x000172) "T_sput_wide_3.java"
- 72 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 390 (0x000186) "V"
- 86 01 00 00
-// parsed: offset 136, len 4: [6] string_data_off: 393 (0x000189) "run"
- 89 01 00 00
-// parsed: offset 140, len 4: [7] string_data_off: 398 (0x00018e) "st_i1"
- 8E 01 00 00
-
-// type_ids:
-// parsed: offset 144, len 4: [0] descriptor_idx: 1 (0x000001) "J"
- 01 00 00 00
-// parsed: offset 148, len 4: [1] descriptor_idx: 2 (0x000002) "Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;"
- 02 00 00 00
-// parsed: offset 152, len 4: [2] descriptor_idx: 3 (0x000003) "Ljava/lang/Object;"
- 03 00 00 00
-// parsed: offset 156, len 4: [3] descriptor_idx: 5 (0x000005) "V"
- 05 00 00 00
-
-// proto_ids:
-// parsed: offset 160, len 12: [0]
-// shorty_idx: 5 (0x000005) "V"
-// return_type_idx: 3 (0x000003) "V"
-// parameters_off: 0 (0x000000)
- 05 00 00 00 03 00 00 00 00 00 00 00
-
-// field_ids:
-// parsed: offset 172, len 8: [0] class_idx: 1 (0x000001) type_idx: 0 (0x000000) name_idx: 7 (0x000007) "st_i1"
- 01 00 00 00 07 00 00 00
-
-// methods_ids:
-// parsed: offset 180, len 8: [0] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-// parsed: offset 188, len 8: [1] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 6 (0x000006) "run"
- 01 00 00 00 06 00 00 00
-// parsed: offset 196, len 8: [2] class_idx: 2 (0x000002) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 02 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 204, len 32: Class [0]
-// class_idx: 1 "Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 2 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 4 "T_sput_wide_3.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 405 (0x000195)
-// static_values_off: 0 (0x000000)
- 01 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 95 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.opcodes.sput_wide.d.T_sput_wide_3.<init>"
- // parsed: offset 236, len 2: registers_size: 1
- 01 00
- // parsed: offset 238, len 2: ins_size: 1
- 01 00
- // parsed: offset 240, len 2: outs_size: 1
- 01 00
- // parsed: offset 242, len 2: tries_size: 0
- 00 00
- // parsed: offset 244, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 248, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 252, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 258, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.opcodes.sput_wide.d.T_sput_wide_3.run"
- // parsed: offset 260, len 2: registers_size: 3
- 03 00
- // parsed: offset 262, len 2: ins_size: 1
- 01 00
- // parsed: offset 264, len 2: outs_size: 0
- 00 00
- // parsed: offset 266, len 2: tries_size: 0
- 00 00
- // parsed: offset 268, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 272, len 4: insns_size: 8
- 08 00 00 00
- // insns:
- // parsed: offset 276, len 10: |0000: const-wide v0, #double 0.000000 // #0x0000000000000001 long
- 18 00 01 00 00 00 00 00 00 00
- // parsed: offset 286, len 4: |0005: sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;.st_i1:J // field@0000
-//@mod 68 00 00 00
- 68 00 00 01
- // parsed: offset 290, len 2: |0007: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 292, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 300, len 3: TYPE_STRING_DATA_ITEM [1] "J"
- 01 4A 00
-// parsed: offset 303, len 47: TYPE_STRING_DATA_ITEM [2] "Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;"
- 2D 4C 64 6F 74 2F 6A 75 6E 69 74 2F 6F 70 63 6F 64 65 73 2F 73 70 75 74 5F 77 69 64 65 2F 64 2F 54 5F 73 70 75 74 5F 77 69 64 65 5F 33 3B 00
-// parsed: offset 350, len 20: TYPE_STRING_DATA_ITEM [3] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 370, len 20: TYPE_STRING_DATA_ITEM [4] "T_sput_wide_3.java"
- 12 54 5F 73 70 75 74 5F 77 69 64 65 5F 33 2E 6A 61 76 61 00
-// parsed: offset 390, len 3: TYPE_STRING_DATA_ITEM [5] "V"
- 01 56 00
-// parsed: offset 393, len 5: TYPE_STRING_DATA_ITEM [6] "run"
- 03 72 75 6E 00
-// parsed: offset 398, len 7: TYPE_STRING_DATA_ITEM [7] "st_i1"
- 05 73 74 5F 69 31 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;"
- // parsed: offset 405, len 1: static_fields_size: 1
- 01
- // parsed: offset 406, len 1: instance_fields_size: 0
- 00
- // parsed: offset 407, len 1: direct_methods_size: 1
- 01
- // parsed: offset 408, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // field [0]:
- // parsed: offset 409, len 1: field_idx_diff: 0 (field_idx: 0 "st_i1")
- 00
- // parsed: offset 410, len 1: access_flags: 0x000009 (PUBLIC STATIC)
- 09
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 411, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 412, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 415, len 2: code_off: 236 (0x0000ec)
- EC 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 417, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 418, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 419, len 2: code_off: 260 (0x000104)
- 84 02
-// parsed: offset 421, len 3: PADDING
- 00 00 00
-// map_list:
- // parsed: offset 424, len 4: size: 11
- 0B 00 00 00
- // parsed: offset 428, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 440, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 8
- // offset: 112 (0x000070)
- 01 00 00 00 08 00 00 00 70 00 00 00
- // parsed: offset 452, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 4
- // offset: 144 (0x000090)
- 02 00 00 00 04 00 00 00 90 00 00 00
- // parsed: offset 464, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 160 (0x0000a0)
- 03 00 00 00 01 00 00 00 A0 00 00 00
- // parsed: offset 476, len 12: [4] type: 0x0004 TYPE_FIELD_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 172 (0x0000ac)
- 04 00 00 00 01 00 00 00 AC 00 00 00
- // parsed: offset 488, len 12: [5] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 180 (0x0000b4)
- 05 00 00 00 03 00 00 00 B4 00 00 00
- // parsed: offset 500, len 12: [6] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 204 (0x0000cc)
- 06 00 00 00 01 00 00 00 CC 00 00 00
- // parsed: offset 512, len 12: [7] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 236 (0x0000ec)
- 01 20 00 00 02 00 00 00 EC 00 00 00
- // parsed: offset 524, len 12: [8] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 8
- // offset: 292 (0x000124)
- 02 20 00 00 08 00 00 00 24 01 00 00
- // parsed: offset 536, len 12: [9] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 405 (0x000195)
- 00 20 00 00 01 00 00 00 95 01 00 00
- // parsed: offset 548, len 12: [10] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 424 (0x0001a8)
- 00 10 00 00 01 00 00 00 A8 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_4.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_4.d
deleted file mode 100644
index 0f29358..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_4.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_4
-.super java/lang/Object
-
-.field public static st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- sput-wide v3, dot.junit.opcodes.sput_wide.d.T_sput_wide_4.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.d
deleted file mode 100644
index 0918986..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.d
+++ /dev/null
@@ -1,38 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_5.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_5
-.super java/lang/Object
-
-.field public static st_i1 D
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 0.5
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_5.st_i1 D
-
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.java
deleted file mode 100644
index 1147ce0..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_5 {
- public static double st_i1;
-
- public void run() {
- st_i1 = 0.5d;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_6.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_6.d
deleted file mode 100644
index 1552b40..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_6.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_6
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 1
- sput-wide v0, dot.junit.opcodes.sput_wide.d.T_sput_wide_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.d
deleted file mode 100644
index 726dfff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_7.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_7
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 0
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_7.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.java
deleted file mode 100644
index 4608227..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_7 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.d
deleted file mode 100644
index f14a34c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_8.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 0
- sput-wide v1, dot.junit.opcodes.sput_wide.TestStubs.TestStubField J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.java
deleted file mode 100644
index 17cf144..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_8 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.d b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.d
deleted file mode 100644
index 64f57d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sput_wide_9.java
-.class public dot.junit.opcodes.sput_wide.d.T_sput_wide_9
-.super java/lang/Object
-
-.field public st_i1 J
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v1, 0
- sput-wide v1, dot.junit.opcodes.sput_wide.d.T_sput_wide_9noclass.st_i1 J
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.java b/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.java
deleted file mode 100644
index 00355dd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sput_wide.d;
-
-public class T_sput_wide_9 {
- public void run() {
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/Test_sub_double.java b/tools/vm-tests/src/dot/junit/opcodes/sub_double/Test_sub_double.java
deleted file mode 100644
index 5126c8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/Test_sub_double.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_double;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_double.d.T_sub_double_1;
-import dot.junit.opcodes.sub_double.d.T_sub_double_3;
-
-public class Test_sub_double extends DxTestCase {
-
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(-0.43999999999999995d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Arguments = 0, -3.14d
- */
- public void testN2() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(3.14d, t.run(0, -3.14d));
- }
-
- /**
- * @title
- */
- public void testN3() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(-0.43999999999999995d, t.run(-3.14d, -2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this subtraction of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_sub_double_3 t = new T_sub_double_3();
- try {
- t.run(12345l, 3.14d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.POSITIVE_INFINITY
- */
- public void testB3() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB4() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = +0, -0d
- */
- public void testB5() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(+0d, t.run(+0d, -0d));
- }
-
- /**
- * @title Arguments = -0d, -0d
- */
- public void testB6() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(0d, t.run(-0d, -0d));
- }
-
- /**
- * @title Arguments = +0d, +0d
- */
- public void testB7() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(+0d, t.run(+0d, +0d));
- }
-
- /**
- * @title Arguments = 2.7d, 2.7d
- */
- public void testB8() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(0d, t.run(2.7d, 2.7d));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.MAX_VALUE
- */
- public void testB9() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(0d, t.run(Double.MAX_VALUE, Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.MIN_VALUE, 4.9E-324
- */
- public void testB10() {
- T_sub_double_1 t = new T_sub_double_1();
- assertEquals(0d, t.run(Double.MIN_VALUE, 4.9E-324));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.d
deleted file mode 100644
index 99060a2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_1.java
-.class public dot.junit.opcodes.sub_double.d.T_sub_double_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- sub-double v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.java
deleted file mode 100644
index 7193f2e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_double.d;
-
-public class T_sub_double_1 {
-
- public double run(double a, double b) {
- return a-b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_2.d
deleted file mode 100644
index e202f3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_2.java
-.class public dot.junit.opcodes.sub_double.d.T_sub_double_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- const v3, 3.1415
- sub-double v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.d
deleted file mode 100644
index ac2644e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_3.java
-.class public dot.junit.opcodes.sub_double.d.T_sub_double_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)D
-.limit regs 7
-
- sub-double v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.java b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.java
deleted file mode 100644
index 9b8ee8e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_double.d;
-
-public class T_sub_double_3 {
-
- public double run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_4.d
deleted file mode 100644
index cf89f31..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_4.java
-.class public dot.junit.opcodes.sub_double.d.T_sub_double_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- sub-double v0, v3, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_5.d
deleted file mode 100644
index 69bbda7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_5.java
-.class public dot.junit.opcodes.sub_double.d.T_sub_double_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- sub-double v0, v3, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_6.d
deleted file mode 100644
index 6995970..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double/d/T_sub_double_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_6.java
-.class public dot.junit.opcodes.sub_double.d.T_sub_double_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 7
- move v0, v5
- move v1, v5
- move v2, v6
- move v3, v6
- sub-double v0, v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java
deleted file mode 100644
index bdd4206..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_double_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_1;
-import dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_3;
-
-public class Test_sub_double_2addr extends DxTestCase {
- /**
- * @title Arguments = 2.7d, 3.14d
- */
- public void testN1() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(-0.43999999999999995d, t.run(2.7d, 3.14d));
- }
-
- /**
- * @title Arguments = 0, -3.14d
- */
- public void testN2() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(3.14d, t.run(0, -3.14d));
- }
-
- /**
- * @title
- */
- public void testN3() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(-0.43999999999999995d, t.run(-3.14d, -2.7d));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this subtraction of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_sub_double_2addr_3 t = new T_sub_double_2addr_3();
- try {
- t.run(12345l, 3.14d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.NaN
- */
- public void testB1() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- Double.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY,
- * Double.POSITIVE_INFINITY
- */
- public void testB3() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
- Double.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Double.POSITIVE_INFINITY, -2.7d
- */
- public void testB4() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
- -2.7d));
- }
-
- /**
- * @title Arguments = +0, -0d
- */
- public void testB5() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(+0d, t.run(+0d, -0d));
- }
-
- /**
- * @title Arguments = -0d, -0d
- */
- public void testB6() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(0d, t.run(-0d, -0d));
- }
-
- /**
- * @title Arguments = +0d, +0d
- */
- public void testB7() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(+0d, t.run(+0d, +0d));
- }
-
- /**
- * @title Arguments = 2.7d, 2.7d
- */
- public void testB8() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(0d, t.run(2.7d, 2.7d));
- }
-
- /**
- * @title Arguments = Double.MAX_VALUE, Double.MAX_VALUE
- */
- public void testB9() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(0d, t.run(Double.MAX_VALUE, Double.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Double.MIN_VALUE, 4.9E-324
- */
- public void testB10() {
- T_sub_double_2addr_1 t = new T_sub_double_2addr_1();
- assertEquals(0d, t.run(Double.MIN_VALUE, 4.9E-324));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - double, reference
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.d
deleted file mode 100644
index 8df12c1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_2addr_1.java
-.class public dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- sub-double/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.java
deleted file mode 100644
index d99e5ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_double_2addr.d;
-
-public class T_sub_double_2addr_1 {
-
- public double run(double a, double b) {
- return a-b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_2.d
deleted file mode 100644
index 0b37443..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_2addr_2.java
-.class public dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- const v3, 3.1415
- sub-double/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.d
deleted file mode 100644
index a866a14..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_2addr_3.java
-.class public dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)D
-.limit regs 7
-
- sub-double/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.java b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.java
deleted file mode 100644
index eb60bf7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_double_2addr.d;
-
-public class T_sub_double_2addr_3 {
-
- public double run(long a, double b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4.d
deleted file mode 100644
index a3236ef..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_2addr_4.java
-.class public dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- sub-double/2addr v3, v2
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5.d
deleted file mode 100644
index aa69895..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_2addr_5.java
-.class public dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DD)D
-.limit regs 7
-
- sub-double/2addr v3, v7
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6.d
deleted file mode 100644
index 07bc954..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6.d
+++ /dev/null
@@ -1,37 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_double_6.java
-.class public dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)V
-.limit regs 7
- move v0, v5
- move v1, v5
- move v2, v6
- move v3, v6
- sub-double/2addr v0, v2
- return-void
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/Test_sub_float.java b/tools/vm-tests/src/dot/junit/opcodes/sub_float/Test_sub_float.java
deleted file mode 100644
index 2e41c99..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/Test_sub_float.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_float;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_float.d.T_sub_float_1;
-import dot.junit.opcodes.sub_float.d.T_sub_float_5;
-
-
-public class Test_sub_float extends DxTestCase {
-
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(-0.44000006f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Arguments = 0, -3.14f
- */
- public void testN2() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(3.14f, t.run(0, -3.14f));
- }
-
- /**
- * @title
- */
- public void testN3() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(-0.44000006f, t.run(-3.14f, -2.7f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this subtraction of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_sub_float_5 t = new T_sub_float_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.POSITIVE_INFINITY
- */
- public void testB3() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB4() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = +0, -0f
- */
- public void testB5() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(+0f, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = -0f, -0f
- */
- public void testB6() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(0f, t.run(-0f, -0f));
- }
-
- /**
- * @title Arguments = +0f, +0f
- */
- public void testB7() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(+0f, t.run(+0f, +0f));
- }
-
- /**
- * @title Arguments = 2.7f, 2.7f
- */
- public void testB8() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(0f, t.run(2.7f, 2.7f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.MAX_VALUE
- */
- public void testB9() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(0f, t.run(Float.MAX_VALUE, Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE, -1.4E-45f
- */
- public void testB10() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(0f, t.run(Float.MIN_VALUE, 1.4E-45f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, -Float.MAX_VALUE
- */
- public void testB11() {
- T_sub_float_1 t = new T_sub_float_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
- -3.402823E+38F));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.d
deleted file mode 100644
index 39f6708..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_1.java
-.class public dot.junit.opcodes.sub_float.d.T_sub_float_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- sub-float v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.java
deleted file mode 100644
index 573404e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_float.d;
-
-public class T_sub_float_1 {
-
- public float run(float a, float b) {
- return a-b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_2.d
deleted file mode 100644
index c144976..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2.java
-.class public dot.junit.opcodes.sub_float.d.T_sub_float_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 5
-
- move v2, v3
- const-wide v3, 3.1415
- sub-float v0, v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_3.d
deleted file mode 100644
index 0456de2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_3.java
-.class public dot.junit.opcodes.sub_float.d.T_sub_float_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 5
-
- move v2, v3
- const-wide v3, 9475928
- sub-float v0, v3, v2
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_4.d
deleted file mode 100644
index 1c73e66..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_4.java
-.class public dot.junit.opcodes.sub_float.d.T_sub_float_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- sub-float v0, v1, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.d
deleted file mode 100644
index c851a5b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_5.java
-.class public dot.junit.opcodes.sub_float.d.T_sub_float_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)F
-.limit regs 4
-
- sub-float v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.java b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.java
deleted file mode 100644
index dd3a944..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_float.d;
-
-public class T_sub_float_5 {
-
- public float run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_6.d
deleted file mode 100644
index c069f2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float/d/T_sub_float_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_6.java
-.class public dot.junit.opcodes.sub_float.d.T_sub_float_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- sub-float v0, v2, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java
deleted file mode 100644
index 5d934b1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_float_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_1;
-import dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_5;
-
-public class Test_sub_float_2addr extends DxTestCase {
- /**
- * @title Arguments = 2.7f, 3.14f
- */
- public void testN1() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(-0.44000006f, t.run(2.7f, 3.14f));
- }
-
- /**
- * @title Arguments = 0, -3.14f
- */
- public void testN2() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(3.14f, t.run(0, -3.14f));
- }
-
- /**
- * @title
- */
- public void testN3() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(-0.44000006f, t.run(-3.14f, -2.7f));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this subtraction of float and int makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_sub_float_2addr_5 t = new T_sub_float_2addr_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.NaN
- */
- public void testB1() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.NEGATIVE_INFINITY
- */
- public void testB2() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- Float.NEGATIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY,
- * Float.POSITIVE_INFINITY
- */
- public void testB3() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY));
- }
-
- /**
- * @title Arguments = Float.POSITIVE_INFINITY, -2.7f
- */
- public void testB4() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
- -2.7f));
- }
-
- /**
- * @title Arguments = +0, -0f
- */
- public void testB5() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(+0f, t.run(+0f, -0f));
- }
-
- /**
- * @title Arguments = -0f, -0f
- */
- public void testB6() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(0f, t.run(-0f, -0f));
- }
-
- /**
- * @title Arguments = +0f, +0f
- */
- public void testB7() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(+0f, t.run(+0f, +0f));
- }
-
- /**
- * @title Arguments = 2.7f, 2.7f
- */
- public void testB8() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(0f, t.run(2.7f, 2.7f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, Float.MAX_VALUE
- */
- public void testB9() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(0f, t.run(Float.MAX_VALUE, Float.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Float.MIN_VALUE, -1.4E-45f
- */
- public void testB10() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(0f, t.run(Float.MIN_VALUE, 1.4E-45f));
- }
-
- /**
- * @title Arguments = Float.MAX_VALUE, -Float.MAX_VALUE
- */
- public void testB11() {
- T_sub_float_2addr_1 t = new T_sub_float_2addr_1();
- assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
- -3.402823E+38F));
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - float, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.d
deleted file mode 100644
index d1c6e61..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2addr_1.java
-.class public dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- sub-float/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.java
deleted file mode 100644
index 0838c38..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_float_2addr.d;
-
-public class T_sub_float_2addr_1 {
-
- public float run(float a, float b) {
- return a-b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2.d
deleted file mode 100644
index 3f3b632..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2addr_2.java
-.class public dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 5
-
- move v2, v3
- const-wide v3, 3.1415
- sub-float/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3.d
deleted file mode 100644
index 5a5f610..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2addr_3.java
-.class public dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 5
-
- move v2, v3
- const-wide v3, 9475928
- sub-float/2addr v3, v2
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4.d
deleted file mode 100644
index f60a149..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2addr_4.java
-.class public dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- sub-float/2addr v1, v3
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.d
deleted file mode 100644
index 561ed3c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2addr_5.java
-.class public dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)F
-.limit regs 4
-
- sub-float/2addr v2, v3
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.java
deleted file mode 100644
index 5a0c748..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_float_2addr.d;
-
-public class T_sub_float_2addr_5 {
-
- public float run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6.d
deleted file mode 100644
index 8d94709..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_float_2addr_6.java
-.class public dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(FF)F
-.limit regs 4
-
- sub-float/2addr v2, v4
- return v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/Test_sub_int.java b/tools/vm-tests/src/dot/junit/opcodes/sub_int/Test_sub_int.java
deleted file mode 100644
index 4a491cf..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/Test_sub_int.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_int.d.T_sub_int_1;
-import dot.junit.opcodes.sub_int.d.T_sub_int_5;
-
-public class Test_sub_int extends DxTestCase {
-
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(4, t.run(8, 4));
- }
-
- /**
- * @title Arguments = 0, 255
- */
- public void testN2() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(-255, t.run(0, 255));
- }
-
- /**
- * @title Arguments = 0, -65536
- */
- public void testN3() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(65536, t.run(0, -65536));
- }
-
- /**
- * @title Arguments = 0, -2147483647
- */
- public void testN4() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(0, -2147483647));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this subtraction of float and int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_sub_int_5 t = new T_sub_int_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Integer.MAX_VALUE
- */
- public void testB1() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(-2147483647, t.run(0, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(0, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, -1
- */
- public void testB3() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE, -1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB4() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -Integer.MIN_VALUE
- */
- public void testB6() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(-2147483648, t.run(0, -Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB7() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(2147483646, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1, Integer.MIN_VALUE
- */
- public void testB8() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(-2147483647, t.run(1, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB9() {
- T_sub_int_1 t = new T_sub_int_1();
- assertEquals(-1, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.d
deleted file mode 100644
index 019f739..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_1.java
-.class public dot.junit.opcodes.sub_int.d.T_sub_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- sub-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.java
deleted file mode 100644
index 46c8b3b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_int.d;
-
-public class T_sub_int_1 {
-
- public int run(int a, int b) {
- return a-b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_2.d
deleted file mode 100644
index 2d6c43f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2.java
-.class public dot.junit.opcodes.sub_int.d.T_sub_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 123456.0
- sub-int v0, v2, v0
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_3.d
deleted file mode 100644
index 4ff0912..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_3.java
-.class public dot.junit.opcodes.sub_int.d.T_sub_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 123456675
- sub-int v0, v0, v2
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_4.d
deleted file mode 100644
index f3b57fc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_4.java
-.class public dot.junit.opcodes.sub_int.d.T_sub_int_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- sub-int v0, v1, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.d
deleted file mode 100644
index f813789..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_5.java
-.class public dot.junit.opcodes.sub_int.d.T_sub_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 4
-
- sub-int v0, v2, v3
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.java
deleted file mode 100644
index ecc613b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_int.d;
-
-public class T_sub_int_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_6.d
deleted file mode 100644
index b45a470..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int/d/T_sub_int_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_6.java
-.class public dot.junit.opcodes.sub_int.d.T_sub_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- sub-int v0, v2, v4
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java
deleted file mode 100644
index cabd0f6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_1;
-import dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_5;
-
-public class Test_sub_int_2addr extends DxTestCase {
- /**
- * @title Arguments = 8, 4
- */
- public void testN1() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(4, t.run(8, 4));
- }
-
- /**
- * @title Arguments = 0, 255
- */
- public void testN2() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(-255, t.run(0, 255));
- }
-
- /**
- * @title Arguments = 0, -65536
- */
- public void testN3() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(65536, t.run(0, -65536));
- }
-
- /**
- * @title Arguments = 0, -2147483647
- */
- public void testN4() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(Integer.MAX_VALUE, t.run(0, -2147483647));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this subtraction of float and int makes no sense but shall not crash the VM.
- */
- public void testN5() {
- T_sub_int_2addr_5 t = new T_sub_int_2addr_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, Integer.MAX_VALUE
- */
- public void testB1() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(-2147483647, t.run(0, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
- */
- public void testB2() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(0, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, -1
- */
- public void testB3() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE, -1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE, 1
- */
- public void testB4() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(Integer.MAX_VALUE, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 0, 0
- */
- public void testB5() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(0, t.run(0, 0));
- }
-
- /**
- * @title Arguments = 0, -Integer.MIN_VALUE
- */
- public void testB6() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(-2147483648, t.run(0, -Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, 1
- */
- public void testB7() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(2147483646, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1, Integer.MIN_VALUE
- */
- public void testB8() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(-2147483647, t.run(1, Integer.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB9() {
- T_sub_int_2addr_1 t = new T_sub_int_2addr_1();
- assertEquals(-1, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.d
deleted file mode 100644
index 203da0d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2addr_1.java
-.class public dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- sub-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.java
deleted file mode 100644
index 03dcff2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_int_2addr.d;
-
-public class T_sub_int_2addr_1 {
-
- public int run(int a, int b) {
- return a-b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2.d
deleted file mode 100644
index e3e5cab..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2addr_2.java
-.class public dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 123456.0
- sub-int/2addr v2, v0
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3.d
deleted file mode 100644
index cad0b89..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2addr_3.java
-.class public dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide v0, 123456675
- sub-int/2addr v0, v2
- return v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4.d
deleted file mode 100644
index efce9cc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2addr_4.java
-.class public dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- sub-int/2addr v0, v2
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.d
deleted file mode 100644
index 77b2c6f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2addr_5.java
-.class public dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 3
-
- sub-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.java
deleted file mode 100644
index 14c9b65..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_int_2addr.d;
-
-public class T_sub_int_2addr_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6.d
deleted file mode 100644
index 1705eb7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_int_2addr_6.java
-.class public dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- sub-int/2addr v1, v3
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/Test_sub_long.java b/tools/vm-tests/src/dot/junit/opcodes/sub_long/Test_sub_long.java
deleted file mode 100644
index 913ed6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/Test_sub_long.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_long.d.T_sub_long_1;
-import dot.junit.opcodes.sub_long.d.T_sub_long_2;
-
-public class Test_sub_long extends DxTestCase {
-
- /**
- * @title Arguments = 1111127348242l, 11111111114l
- */
- public void testN1() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(1100016237128l, t.run(1111127348242l, 11111111114l));
- }
-
- /**
- * @title Arguments = 0, 1111127348242l
- */
- public void testN2() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(-1111127348242l, t.run(0, 1111127348242l));
- }
-
- /**
- * @title Arguments = 0, -11111111114l
- */
- public void testN3() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(11111111114l, t.run(0, -11111111114l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this subtraction of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_sub_long_2 t = new T_sub_long_2();
- try {
- t.run(12345l, 3.14d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0l, Long.MAX_VALUE
- */
- public void testB1() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(-9223372036854775807L, t.run(0l, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 9223372036854775807L, Long.MAX_VALUE
- */
- public void testB2() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(0l, t.run(9223372036854775807L, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, -1l
- */
- public void testB3() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(-9223372036854775808L, t.run(Long.MAX_VALUE, -1l));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1l
- */
- public void testB4() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(9223372036854775807L, t.run(Long.MIN_VALUE, 1l));
- }
-
- /**
- * @title Arguments = 0l, 0l
- */
- public void testB5() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(0l, t.run(0l, 0l));
- }
-
- /**
- * @title Arguments = 0l, -Long.MIN_VALUE
- */
- public void testB6() {
- T_sub_long_1 t = new T_sub_long_1();
- assertEquals(-9223372036854775808L, t.run(0l, -Long.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, reference
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.d
deleted file mode 100644
index 4367232..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_1.java
-.class public dot.junit.opcodes.sub_long.d.T_sub_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
- sub-long v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.java
deleted file mode 100644
index 24a0f90..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_long.d;
-
-public class T_sub_long_1 {
-
- public long run(long a, long b) {
- return a-b;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.d
deleted file mode 100644
index 6e191ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2.java
-.class public dot.junit.opcodes.sub_long.d.T_sub_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 7
- sub-long v0, v3, v5
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.java
deleted file mode 100644
index 733b4dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_long.d;
-
-public class T_sub_long_2 {
-
- public long run(long a, double b) {
- return 0;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_3.d
deleted file mode 100644
index 5fe421f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_3.java
-.class public dot.junit.opcodes.sub_long.d.T_sub_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
- const v3, 12346
- sub-long v0, v3, v5
- return-wide v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_4.d
deleted file mode 100644
index 7ab2d2d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_4.java
-.class public dot.junit.opcodes.sub_long.d.T_sub_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
- const v5, 12346.0
- sub-long v0, v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_5.d
deleted file mode 100644
index c498408..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_5.java
-.class public dot.junit.opcodes.sub_long.d.T_sub_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
- sub-long v0, v3, v2
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_6.d
deleted file mode 100644
index f9f2065..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long/d/T_sub_long_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_6.java
-.class public dot.junit.opcodes.sub_long.d.T_sub_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
- sub-long v0, v3, v7
- return-wide v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java
deleted file mode 100644
index 27a3d09..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_1;
-import dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_2;
-
-public class Test_sub_long_2addr extends DxTestCase {
-
- /**
- * @title Arguments = 1111127348242l, 11111111114l
- */
- public void testN1() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(1100016237128l, t.run(1111127348242l, 11111111114l));
- }
-
- /**
- * @title Arguments = 0, 1111127348242l
- */
- public void testN2() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(-1111127348242l, t.run(0, 1111127348242l));
- }
-
- /**
- * @title Arguments = 0, -11111111114l
- */
- public void testN3() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(11111111114l, t.run(0, -11111111114l));
- }
-
- /**
- * @title Types of arguments - long, double. Dalvik doens't distinguish 64-bits types internally,
- * so this subtraction of double and long makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_sub_long_2addr_2 t = new T_sub_long_2addr_2();
- try {
- t.run(12345l, 3.14d);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0l, Long.MAX_VALUE
- */
- public void testB1() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(-9223372036854775807L, t.run(0l, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = 9223372036854775807L, Long.MAX_VALUE
- */
- public void testB2() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(0l, t.run(9223372036854775807L, Long.MAX_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE, -1l
- */
- public void testB3() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(Long.MAX_VALUE, -1l));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE, 1l
- */
- public void testB4() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(9223372036854775807L, t.run(Long.MIN_VALUE, 1l));
- }
-
- /**
- * @title Arguments = 0l, 0l
- */
- public void testB5() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(0l, t.run(0l, 0l));
- }
-
- /**
- * @title Arguments = 0l, -Long.MIN_VALUE
- */
- public void testB6() {
- T_sub_long_2addr_1 t = new T_sub_long_2addr_1();
- assertEquals(-9223372036854775808L, t.run(0l, -Long.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, float
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, reference
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.d
deleted file mode 100644
index f416a03..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2addr_1.java
-.class public dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- sub-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.java
deleted file mode 100644
index 8d66c2b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_long_2addr.d;
-
-public class T_sub_long_2addr_1 {
-
- public long run(long a, long b) {
- return a-b;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.d
deleted file mode 100644
index eb91aff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2addr_2.java
-.class public dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 7
- sub-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.java b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.java
deleted file mode 100644
index 33f4b88..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.sub_long_2addr.d;
-
-public class T_sub_long_2addr_2 {
-
- public long run(long a, double b) {
- return 0;
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3.d
deleted file mode 100644
index bea4aea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2addr_3.java
-.class public dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- const v3, 12346
- sub-long/2addr v3, v5
- return-wide v5
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_4.d
deleted file mode 100644
index 57d6c24..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2addr_4.java
-.class public dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
- const v5, 12346.0
- sub-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5.d
deleted file mode 100644
index da99ce1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2addr_5.java
-.class public dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- sub-long/2addr v3, v2
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6.d
deleted file mode 100644
index fb874e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sub_long_2addr_6.java
-.class public dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 7
-
- sub-long/2addr v3, v7
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java
deleted file mode 100644
index 2701607..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.ushr_int.d.T_ushr_int_1;
-import dot.junit.opcodes.ushr_int.d.T_ushr_int_5;
-
-public class Test_ushr_int extends DxTestCase {
- /**
- * @title 15 >> 1
- */
- public void testN1() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(7, t.run(15, 1));
- }
-
- /**
- * @title 33 >> 2
- */
- public void testN2() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(8, t.run(33, 2));
- }
-
- /**
- * @title -15 >> 1
- */
- public void testN3() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(0x7FFFFFF8, t.run(-15, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(0, t.run(1, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(16, t.run(33, 33));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (int >>> float) makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_ushr_int_5 t = new T_ushr_int_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(0x40000000, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_ushr_int_1 t = new T_ushr_int_1();
- assertEquals(1, t.run(1, 0));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.d
deleted file mode 100644
index dd22d10..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_1.java
-.class public dot.junit.opcodes.ushr_int.d.T_ushr_int_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- ushr-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.java
deleted file mode 100644
index b633fc2..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int.d;
-
-public class T_ushr_int_1 {
-
- public int run(int a, int b) {
- return a >>> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_2.d
deleted file mode 100644
index 75880f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2.java
-.class public dot.junit.opcodes.ushr_int.d.T_ushr_int_2
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- move v1, v2
- const-wide v2, 12345.0
- ushr-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_3.d
deleted file mode 100644
index 802f349..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_3.java
-.class public dot.junit.opcodes.ushr_int.d.T_ushr_int_3
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)I
-.limit regs 4
-
- ushr-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_4.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_4.d
deleted file mode 100644
index 289c777..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_4.java
-.class public dot.junit.opcodes.ushr_int.d.T_ushr_int_4
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- ushr-int v1, v1, v0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.d
deleted file mode 100644
index 2fdf2b6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_5.java
-.class public dot.junit.opcodes.ushr_int.d.T_ushr_int_5
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 3
-
- ushr-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.java
deleted file mode 100644
index 4b5c31f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int.d;
-
-public class T_ushr_int_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_6.d
deleted file mode 100644
index b216968..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_6.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_6.java
-.class public dot.junit.opcodes.ushr_int.d.T_ushr_int_6
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- ushr-int v1, v1, v3
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java
deleted file mode 100644
index e1c4217..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_1;
-import dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_5;
-
-public class Test_ushr_int_2addr extends DxTestCase {
- /**
- * @title 15 >> 1
- */
- public void testN1() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(7, t.run(15, 1));
- }
-
- /**
- * @title 33 >> 2
- */
- public void testN2() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(8, t.run(33, 2));
- }
-
- /**
- * @title -15 >> 1
- */
- public void testN3() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(0x7FFFFFF8, t.run(-15, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(0, t.run(1, -1));
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(16, t.run(33, 33));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (int >>> float) makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_ushr_int_2addr_5 t = new T_ushr_int_2addr_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(0, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(0x40000000, t.run(Integer.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_ushr_int_2addr_1 t = new T_ushr_int_2addr_1();
- assertEquals(1, t.run(1, 0));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.d
deleted file mode 100644
index 5ee3392..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2addr_1.java
-.class public dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- ushr-int/2addr v1, v2
- return v1
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.java
deleted file mode 100644
index dd53d3d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_2addr.d;
-
-public class T_ushr_int_2addr_1 {
-
- public int run(int a, int b) {
- return a >>> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2.d
deleted file mode 100644
index d7be0ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2addr_2.java
-.class public dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_2
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- move v1, v2
- const-wide v2, 12345.0
- ushr-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3.d
deleted file mode 100644
index a7e8263..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2addr_3.java
-.class public dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_3
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IJ)I
-.limit regs 4
-
- ushr-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4.d
deleted file mode 100644
index 330ce0a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2addr_4.java
-.class public dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_4
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- ushr-int/2addr v1, v0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.d
deleted file mode 100644
index d5906eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2addr_5.java
-.class public dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 3
-
- ushr-int/2addr v1, v2
- return v1
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.java
deleted file mode 100644
index 3e1776c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_2addr.d;
-
-public class T_ushr_int_2addr_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6.d
deleted file mode 100644
index 0e3753c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_2addr_6.java
-.class public dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- ushr-int/2addr v1, v3
- return v1
-.end method
-
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java
deleted file mode 100644
index 99b3ac9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_1;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_13;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_2;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_3;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_4;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_5;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_6;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_7;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_8;
-import dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_9;
-
-
-public class Test_ushr_int_lit8 extends DxTestCase {
- /**
- * @title 15 >> 1
- */
- public void testN1() {
- T_ushr_int_lit8_1 t = new T_ushr_int_lit8_1();
- assertEquals(7, t.run());
- }
-
- /**
- * @title 33 >> 2
- */
- public void testN2() {
- T_ushr_int_lit8_2 t = new T_ushr_int_lit8_2();
- assertEquals(8, t.run());
- }
-
- /**
- * @title -15 >> 1
- */
- public void testN3() {
- T_ushr_int_lit8_3 t = new T_ushr_int_lit8_3();
- assertEquals(0x7FFFFFF8, t.run());
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_ushr_int_lit8_4 t = new T_ushr_int_lit8_4();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Verify that shift distance is actually in range 0 to 32.
- */
- public void testN5() {
- T_ushr_int_lit8_5 t = new T_ushr_int_lit8_5();
- assertEquals(16, t.run());
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float >>> ) makes no sense but shall not crash the VM.
- */
- public void testN6() {
- T_ushr_int_lit8_13 t = new T_ushr_int_lit8_13();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_ushr_int_lit8_6 t = new T_ushr_int_lit8_6();
- assertEquals(0, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE & 1
- */
- public void testB2() {
- T_ushr_int_lit8_7 t = new T_ushr_int_lit8_7();
- assertEquals(0x3FFFFFFF, t.run());
- }
-
- /**
- * @title Arguments = Integer.MIN_VALUE & 1
- */
- public void testB3() {
- T_ushr_int_lit8_8 t = new T_ushr_int_lit8_8();
- assertEquals(0x40000000, t.run());
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_ushr_int_lit8_9 t = new T_ushr_int_lit8_9();
- assertEquals(1, t.run());
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - double, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.d
deleted file mode 100644
index 3d6d12d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_1.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, 15
- ushr-int/lit8 v1, v1, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.java
deleted file mode 100644
index 35f5305..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_1 {
-
- public int run() {
- return 15 >>> 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10.d
deleted file mode 100644
index 66e89fa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_10.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_10
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide v0, 12345456788.0
- ushr-int/lit8 v1, v0, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_11.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_11.d
deleted file mode 100644
index d0b5a53..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_11.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_11.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_11
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
- const-wide v0, 12345456788
- ushr-int/lit8 v1, v0, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12.d
deleted file mode 100644
index 9925d72..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_12.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_12
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 2
-
- ushr-int/lit8 v0, v1, 1
- return v0
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.d
deleted file mode 100644
index 431983f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_13.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_13
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 3
-
- ushr-int/lit8 v1, v2, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.java
deleted file mode 100644
index 42f09dc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_13 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14.d
deleted file mode 100644
index 7bf0d26..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_14.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_14
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 3
-
- ushr-int/lit8 v1, v3, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.d
deleted file mode 100644
index 2727421..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_2.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_2
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, 33
- ushr-int/lit8 v1, v1, 2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.java
deleted file mode 100644
index 8ef472e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_2 {
-
- public int run() {
- return 32 >>> 2;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.d
deleted file mode 100644
index d51d0ad..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_3.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_3
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, -15
- ushr-int/lit8 v1, v1, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.java
deleted file mode 100644
index 0917deb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_3 {
-
- public int run() {
- return -15 >>> 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.d
deleted file mode 100644
index c69a8cd..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_4.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_4
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, 1
- ushr-int/lit8 v1, v1, -1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.java
deleted file mode 100644
index e0224f5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_4 {
-
- public int run() {
- return 1 >>> -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.d
deleted file mode 100644
index 9e75732..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_5.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_5
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, 33
- ushr-int/lit8 v1, v1, 33
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.java
deleted file mode 100644
index b1d83aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_5 {
-
- public int run() {
- return 33 >>> 33;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.d
deleted file mode 100644
index 8387c15..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_6.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_6
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, 0
- ushr-int/lit8 v1, v1, -1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.java
deleted file mode 100644
index 548014a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_6 {
-
- public int run() {
- return 0 >>> -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.d
deleted file mode 100644
index 1a49829..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_7.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_7
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- ushr-int/lit8 v1, v1, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.java
deleted file mode 100644
index 1e0b00f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_7 {
-
- public int run() {
- return Integer.MAX_VALUE >>> 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.d
deleted file mode 100644
index 415d6d6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_8.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_8
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, -2147483648
- ushr-int/lit8 v1, v1, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.java
deleted file mode 100644
index 6e6a65e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_8 {
-
- public int run() {
- return Integer.MIN_VALUE >>> 1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.d
deleted file mode 100644
index 34be720..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_int_lit8_9.java
-.class public dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_9
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const/16 v1, 1
- ushr-int/lit8 v1, v1, 0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.java
deleted file mode 100644
index a69257a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_int_lit8.d;
-
-public class T_ushr_int_lit8_9 {
-
- public int run() {
- return 1 >>> 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java
deleted file mode 100644
index 338d067..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.ushr_long.d.T_ushr_long_1;
-import dot.junit.opcodes.ushr_long.d.T_ushr_long_2;
-
-public class Test_ushr_long extends DxTestCase {
- /**
- * @title Arguments = 40000000000l, 3
- */
- public void testN1() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(5000000000l, t.run(40000000000l, 3));
- }
-
- /**
- * @title Arguments = 40000000000l, 1
- */
- public void testN2() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(20000000000l, t.run(40000000000l, 1));
- }
-
- /**
- * @title Arguments = -123456789l, 1
- */
- public void testN3() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(0x7FFFFFFFFC521975l, t.run(-123456789l, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(0l, t.run(1l, -1));
- }
-
- /**
- * @title Arguments = 123456789l, 64
- */
- public void testN5() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(123456789l, t.run(123456789l, 64));
- }
-
- /**
- * @title Arguments = 123456789l, 63
- */
- public void testN6() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(0l, t.run(123456789l, 63));
- }
-
- /**
- * @title Types of arguments - double, int. Dalvik doens't distinguish 64-bits types internally,
- * so this (double >>> int) makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_ushr_long_2 t = new T_ushr_long_2();
- try {
- t.run(3.14d, 1);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(0l, t.run(0l, -1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & 1
- */
- public void testB2() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(0x3FFFFFFFFFFFFFFFl, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE & 1
- */
- public void testB3() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(0x4000000000000000l, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_ushr_long_1 t = new T_ushr_long_1();
- assertEquals(1l, t.run(1l, 0));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, reference
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.d
deleted file mode 100644
index 5479c4e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_1.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- ushr-long v1, v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.java
deleted file mode 100644
index 1b2517e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_long.d;
-
-public class T_ushr_long_1 {
-
- public long run(long a, int b) {
- return a >>> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.d
deleted file mode 100644
index e8a6322..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)J
-.limit regs 6
-
- ushr-long v0, v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.java
deleted file mode 100644
index e278f8a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_long.d;
-
-public class T_ushr_long_2 {
-
- public long run(double b, int i) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_3.d
deleted file mode 100644
index 1a7a9eb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_3.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- move v2, v3
- ushr-long v1, v2, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_4.d
deleted file mode 100644
index 03ae1aa..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_4.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 6
-
- const v0, 12345.0
- ushr-long v0, v0, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_5.d
deleted file mode 100644
index 05560ac..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_5.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- ushr-long v1, v1, v0
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_6.d
deleted file mode 100644
index 6e7d40a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_6.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- ushr-long v1, v1, v4
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_7.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_7.d
deleted file mode 100644
index d2f672b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_7.java
-.class public dot.junit.opcodes.ushr_long.d.T_ushr_long_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 6
-
- ushr-long v1, v2, v4
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java
deleted file mode 100644
index 72747f4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_1;
-import dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_2;
-
-public class Test_ushr_long_2addr extends DxTestCase {
- /**
- * @title Arguments = 40000000000l, 3
- */
- public void testN1() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(5000000000l, t.run(40000000000l, 3));
- }
-
- /**
- * @title Arguments = 40000000000l, 1
- */
- public void testN2() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(20000000000l, t.run(40000000000l, 1));
- }
-
- /**
- * @title Arguments = -123456789l, 1
- */
- public void testN3() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(0x7FFFFFFFFC521975l, t.run(-123456789l, 1));
- }
-
- /**
- * @title Arguments = 1 & -1
- */
- public void testN4() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(0l, t.run(1l, -1));
- }
-
- /**
- * @title Arguments = 123456789l, 64
- */
- public void testN5() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(123456789l, t.run(123456789l, 64));
- }
-
- /**
- * @title Arguments = 123456789l, 63
- */
- public void testN6() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(0l, t.run(123456789l, 63));
- }
-
- /**
- * @title Types of arguments - double, int. Dalvik doens't distinguish 64-bits types internally,
- * so this (double >>> int) makes no sense but shall not crash the VM.
- */
- public void testN7() {
- T_ushr_long_2addr_2 t = new T_ushr_long_2addr_2();
- try {
- t.run(3.14d, 1);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(0l, t.run(0l, -1));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & 1
- */
- public void testB2() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(0x3FFFFFFFFFFFFFFFl, t.run(Long.MAX_VALUE, 1));
- }
-
- /**
- * @title Arguments = Long.MIN_VALUE & 1
- */
- public void testB3() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(0x4000000000000000l, t.run(Long.MIN_VALUE, 1));
- }
-
- /**
- * @title Arguments = 1 & 0
- */
- public void testB4() {
- T_ushr_long_2addr_1 t = new T_ushr_long_2addr_1();
- assertEquals(1l, t.run(1l, 0));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, double
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - int, int
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - float, int
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - long, reference
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.d
deleted file mode 100644
index 4b154c5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_1.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- ushr-long/2addr v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.java
deleted file mode 100644
index 142cda3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_long_2addr.d;
-
-public class T_ushr_long_2addr_1 {
-
- public long run(long a, int b) {
- return a >>> b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.d
deleted file mode 100644
index 22a3e6d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_2.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DI)J
-.limit regs 6
-
- ushr-long/2addr v3, v5
- return-wide v3
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.java b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.java
deleted file mode 100644
index af70b1c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.ushr_long_2addr.d;
-
-public class T_ushr_long_2addr_2 {
-
- public long run(double a, int b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3.d
deleted file mode 100644
index c76441e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_3.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- move v0, v3
- ushr-long/2addr v0, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_4.d
deleted file mode 100644
index 4f03522..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_4.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- const v1, 12345.0
- ushr-long/2addr v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5.d
deleted file mode 100644
index 12e930c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_5.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- ushr-long/2addr v1, v0
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6.d
deleted file mode 100644
index 0d1898a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_6.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JI)J
-.limit regs 4
-
- ushr-long/2addr v1, v4
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7.d b/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7.d
deleted file mode 100644
index b645617..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ushr_long_2addr_7.java
-.class public dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JD)J
-.limit regs 6
-
- ushr-long/2addr v2, v4
- return-wide v2
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/Test_xor_int.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int/Test_xor_int.java
deleted file mode 100644
index 8d976ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/Test_xor_int.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.xor_int.d.T_xor_int_1;
-import dot.junit.opcodes.xor_int.d.T_xor_int_5;
-
-public class Test_xor_int extends DxTestCase {
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_xor_int_1 t = new T_xor_int_1();
- assertEquals(7, t.run(15, 8));
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfffffff1
- */
- public void testN2() {
- T_xor_int_1 t = new T_xor_int_1();
- assertEquals(9, t.run(0xfffffff8, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xcafe, -1
- */
- public void testN3() {
- T_xor_int_1 t = new T_xor_int_1();
- assertEquals(0xFFFF3501, t.run(0xcafe, -1));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (int ^ float) makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_xor_int_5 t = new T_xor_int_5();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, -1
- */
- public void testB1() {
- T_xor_int_1 t = new T_xor_int_1();
- assertEquals(-1, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB2() {
- T_xor_int_1 t = new T_xor_int_1();
- assertEquals(0xffffffff, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.d
deleted file mode 100644
index 2c2fbfb..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_1.java
-.class public dot.junit.opcodes.xor_int.d.T_xor_int_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- xor-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.java
deleted file mode 100644
index 75f5df4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int.d;
-
-public class T_xor_int_1 {
-
- public int run(int a, int b) {
- return a ^ b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_2.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_2.d
deleted file mode 100644
index 339a3e9..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_2.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_2.java
-.class public dot.junit.opcodes.xor_int.d.T_xor_int_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- move v1, v2
- const-wide/16 v2, 12345
- xor-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_3.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_3.d
deleted file mode 100644
index b733277..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_3.java
-.class public dot.junit.opcodes.xor_int.d.T_xor_int_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- xor-int v1, v1, v0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.d
deleted file mode 100644
index 879afe5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_5.java
-.class public dot.junit.opcodes.xor_int.d.T_xor_int_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 3
-
- xor-int v1, v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.java
deleted file mode 100644
index 5c50e59..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int.d;
-
-public class T_xor_int_5 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_6.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_6.d
deleted file mode 100644
index 0768d87..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int/d/T_xor_int_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_6.java
-.class public dot.junit.opcodes.xor_int.d.T_xor_int_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- xor-int v1, v1, v3
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java
deleted file mode 100644
index 630bf5d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_1;
-import dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_4;
-
-public class Test_xor_int_2addr extends DxTestCase {
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_xor_int_2addr_1 t = new T_xor_int_2addr_1();
- assertEquals(7, t.run(15, 8));
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfffffff1
- */
- public void testN2() {
- T_xor_int_2addr_1 t = new T_xor_int_2addr_1();
- assertEquals(9, t.run(0xfffffff8, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xcafe, -1
- */
- public void testN3() {
- T_xor_int_2addr_1 t = new T_xor_int_2addr_1();
- assertEquals(0xFFFF3501, t.run(0xcafe, -1));
- }
-
- /**
- * @title Types of arguments - int, float. Dalvik doens't distinguish 32-bits types internally,
- * so this (int ^ float) makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_xor_int_2addr_4 t = new T_xor_int_2addr_4();
- try {
- t.run(1, 3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, -1
- */
- public void testB1() {
- T_xor_int_2addr_1 t = new T_xor_int_2addr_1();
- assertEquals(-1, t.run(0, -1));
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
- */
- public void testB2() {
- T_xor_int_2addr_1 t = new T_xor_int_2addr_1();
- assertEquals(0xffffffff, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.d
deleted file mode 100644
index 561db60..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_2addr_1.java
-.class public dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- xor-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.java
deleted file mode 100644
index 2d4a699..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_2addr.d;
-
-public class T_xor_int_2addr_1 {
-
- public int run(int a, int b) {
- return a ^ b;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2.d
deleted file mode 100644
index 7d19a9b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_2addr_2.java
-.class public dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 4
-
- const-wide/16 v2, 12345
- xor-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3.d
deleted file mode 100644
index f51a717..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_2addr_3.java
-.class public dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- xor-int/2addr v1, v0
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.d
deleted file mode 100644
index cc64eb3..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_2addr_4.java
-.class public dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(IF)I
-.limit regs 3
-
- xor-int/2addr v1, v2
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.java
deleted file mode 100644
index f779ebc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_2addr.d;
-
-public class T_xor_int_2addr_4 {
-
- public int run(int a, float b) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5.d
deleted file mode 100644
index 5430394..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_2addr_5.java
-.class public dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(II)I
-.limit regs 3
-
- xor-int/2addr v1, v3
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java
deleted file mode 100644
index e31a49c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit16;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_1;
-import dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_2;
-import dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_3;
-import dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_4;
-import dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_7;
-
-public class Test_xor_int_lit16 extends DxTestCase {
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_xor_int_lit16_1 t = new T_xor_int_lit16_1();
- assertEquals(7, t.run());
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xfff1
- */
- public void testN2() {
- T_xor_int_lit16_2 t = new T_xor_int_lit16_2();
- assertEquals(9, t.run());
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float ^ int) makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_xor_int_lit16_7 t = new T_xor_int_lit16_7();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, -1
- */
- public void testB1() {
- T_xor_int_lit16_3 t = new T_xor_int_lit16_3();
- assertEquals(-1, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Short.MIN_VALUE
- */
- public void testB2() {
- T_xor_int_lit16_4 t = new T_xor_int_lit16_4();
- assertEquals(-2147450881, t.run());
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long & int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference & int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.d
deleted file mode 100644
index ba07a33..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_1.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 15
- xor-int/lit16 v1, v1, 8
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.java
deleted file mode 100644
index bff43df..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit16.d;
-
-public class T_xor_int_lit16_1 {
-
- public int run() {
- return 15 ^ 8;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.d
deleted file mode 100644
index 6b5a110..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_2.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v2, -8
- xor-int/lit16 v1, v2, -15
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.java
deleted file mode 100644
index 938a23d..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit16.d;
-
-public class T_xor_int_lit16_2 {
-
- public int run() {
- return 0xfffffff8 ^ 0xfff1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.d
deleted file mode 100644
index 56f0458..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_3.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- xor-int/lit16 v1, v1, -1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.java
deleted file mode 100644
index 2bc9c62..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit16.d;
-
-public class T_xor_int_lit16_3 {
-
- public int run() {
- return 0 ^ -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.d
deleted file mode 100644
index ec92408..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_4.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- xor-int/lit16 v1, v1, -32768
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.java
deleted file mode 100644
index 6626871..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit16.d;
-
-public class T_xor_int_lit16_4 {
-
- public int run() {
- return Integer.MAX_VALUE ^ Short.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5.d
deleted file mode 100644
index a0906e6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_5.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide/16 v2, 12345
- xor-int/lit16 v1, v2, -32768
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6.d
deleted file mode 100644
index 5aa6343..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_6.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- xor-int/lit16 v1, v2, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.d
deleted file mode 100644
index ea16bae..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_7.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 3
-
- xor-int/lit16 v1, v2, 8
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.java
deleted file mode 100644
index d7b747e..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit16.d;
-
-public class T_xor_int_lit16_7 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8.d
deleted file mode 100644
index 5d8cb85..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit16_8.java
-.class public dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 3
-
- xor-int/lit16 v1, v3, 8
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java
deleted file mode 100644
index e06d5e1..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit8;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_1;
-import dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_2;
-import dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_3;
-import dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_4;
-import dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_7;
-
-public class Test_xor_int_lit8 extends DxTestCase {
- /**
- * @title Arguments = 15, 8
- */
- public void testN1() {
- T_xor_int_lit8_1 t = new T_xor_int_lit8_1();
- assertEquals(7, t.run());
- }
-
- /**
- * @title Arguments = 0xfffffff8, 0xf1
- */
- public void testN2() {
- T_xor_int_lit8_2 t = new T_xor_int_lit8_2();
- assertEquals(9, t.run());
- }
-
- /**
- * @title Type of argument - float. Dalvik doens't distinguish 32-bits types internally,
- * so this (float ^ int) makes no sense but shall not crash the VM.
- */
- public void testN3() {
- T_xor_int_lit8_7 t = new T_xor_int_lit8_7();
- try {
- t.run(3.14f);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0, -1
- */
- public void testB1() {
- T_xor_int_lit8_3 t = new T_xor_int_lit8_3();
- assertEquals(-1, t.run());
- }
-
- /**
- * @title Arguments = Integer.MAX_VALUE, Byte.MIN_VALUE
- */
- public void testB2() {
- T_xor_int_lit8_4 t = new T_xor_int_lit8_4();
- assertEquals(-2147483521, t.run());
- }
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - long, int
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B1
- * @title types of arguments - reference, int
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint A23
- * @title number of registers
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.d
deleted file mode 100644
index cb4d830..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_1.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 15
- xor-int/lit16 v1, v1, 8
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.java
deleted file mode 100644
index ff2c78b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit8.d;
-
-public class T_xor_int_lit8_1 {
-
- public int run() {
- return 15 ^ 8;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.d
deleted file mode 100644
index 8d23bf6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_2.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v2, -8
- xor-int/lit16 v1, v2, -15
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.java
deleted file mode 100644
index d62fd56..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit8.d;
-
-public class T_xor_int_lit8_2 {
-
- public int run() {
- return 0xfffffff8 ^ 0xf1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.d
deleted file mode 100644
index 5953574..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_3.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 0
- xor-int/lit16 v1, v1, -1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.java
deleted file mode 100644
index 31fa48c..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit8.d;
-
-public class T_xor_int_lit8_3 {
-
- public int run() {
- return 0 ^ -1;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.d
deleted file mode 100644
index c2270c4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_4.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- const v1, 2147483647
- xor-int/lit16 v1, v1, -128
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.java
deleted file mode 100644
index 6b2d4f7..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit8.d;
-
-public class T_xor_int_lit8_4 {
-
- public int run() {
- return Integer.MAX_VALUE ^ Byte.MIN_VALUE;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5.d
deleted file mode 100644
index 3a3da2b..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_5.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 4
-
- const-wide/16 v2, 12345
- xor-int/lit8 v1, v2, -128
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6.d
deleted file mode 100644
index b3ab7e4..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_6.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()I
-.limit regs 3
-
- xor-int/lit16 v1, v2, 1
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.d
deleted file mode 100644
index 74bf7e5..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_7.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_7
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(F)I
-.limit regs 3
-
- xor-int/lit16 v1, v2, 8
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.java b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.java
deleted file mode 100644
index ecd3130..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_int_lit8.d;
-
-public class T_xor_int_lit8_7 {
-
- public int run(float f) {
- return 0;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8.d b/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8.d
deleted file mode 100644
index 0857ea6..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_int_lit8_8.java
-.class public dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_8
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(I)I
-.limit regs 3
-
- xor-int/lit16 v1, v3, 8
- return v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/Test_xor_long.java b/tools/vm-tests/src/dot/junit/opcodes/xor_long/Test_xor_long.java
deleted file mode 100644
index dac7041..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/Test_xor_long.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_long;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.xor_long.d.T_xor_long_1;
-import dot.junit.opcodes.xor_long.d.T_xor_long_2;
-
-public class Test_xor_long extends DxTestCase {
- /**
- * @title Arguments = 23423432423777l, 23423432423778l
- */
- public void testN1() {
- T_xor_long_1 t = new T_xor_long_1();
- assertEquals(3, t.run(23423432423777l, 23423432423778l));
- }
-
- /**
- * @title Arguments = 0xfffffff5, 0xfffffff1
- */
- public void testN2() {
- T_xor_long_1 t = new T_xor_long_1();
- assertEquals(4, t.run(0xfffffff5, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xABCDEFAB & -1
- */
- public void testN3() {
- T_xor_long_1 t = new T_xor_long_1();
- assertEquals(0x54321054, t.run(0xABCDEFAB, -1l));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this (double ^ long ) makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_xor_long_2 t = new T_xor_long_2();
- try {
- t.run(3.14d, 1234l);
- } catch (Throwable e) {
- }
- }
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_xor_long_1 t = new T_xor_long_1();
- assertEquals(-1l, t.run(0l, -1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MIN_VALUE
- */
- public void testB2() {
- T_xor_long_1 t = new T_xor_long_1();
- assertEquals(0xffffffff, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MAX_VALUE
- */
- public void testB3() {
- T_xor_long_1 t = new T_xor_long_1();
- assertEquals(0l, t.run(Long.MAX_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @constraint A24
- * @title number of registers
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title types of arguments - float, long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title types of arguments - reference, long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.d
deleted file mode 100644
index fb345ea..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_1.java
-.class public dot.junit.opcodes.xor_long.d.T_xor_long_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- xor-long v1, v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.java b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.java
deleted file mode 100644
index 9389b63..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_long.d;
-
-public class T_xor_long_1 {
-
- public long run(long a, long b) {
- return a ^ b;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.d
deleted file mode 100644
index 52f7815..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2.java
-.class public dot.junit.opcodes.xor_long.d.T_xor_long_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DJ)J
-.limit regs 5
-
- xor-long v1, v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.java b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.java
deleted file mode 100644
index 64a5a9a..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_long.d;
-
-public class T_xor_long_2 {
-
- public long run(double a, long b) {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_3.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_3.d
deleted file mode 100644
index 2042970..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_3.java
-.class public dot.junit.opcodes.xor_long.d.T_xor_long_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- const/16 v3, 1234
- xor-long v1, v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_4.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_4.d
deleted file mode 100644
index 28e9fff..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_4.java
-.class public dot.junit.opcodes.xor_long.d.T_xor_long_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- const v3, 1234.0
- xor-long v1, v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_5.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_5.d
deleted file mode 100644
index a48545f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_5.java
-.class public dot.junit.opcodes.xor_long.d.T_xor_long_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- xor-long v1, v1, v0
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_6.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_6.d
deleted file mode 100644
index 0e2c18f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long/d/T_xor_long_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_6.java
-.class public dot.junit.opcodes.xor_long.d.T_xor_long_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- xor-long v1, v1, v5
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java
deleted file mode 100644
index 8e4a4bc..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_long_2addr;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-import dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_1;
-import dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_2;
-
-public class Test_xor_long_2addr extends DxTestCase {
- /**
- * @title Arguments = 23423432423777l, 23423432423778l
- */
- public void testN1() {
- T_xor_long_2addr_1 t = new T_xor_long_2addr_1();
- assertEquals(3, t.run(23423432423777l, 23423432423778l));
- }
-
- /**
- * @title Arguments = 0xfffffff5, 0xfffffff1
- */
- public void testN2() {
- T_xor_long_2addr_1 t = new T_xor_long_2addr_1();
- assertEquals(4, t.run(0xfffffff5, 0xfffffff1));
- }
-
- /**
- * @title Arguments = 0xABCDEFAB & -1
- */
- public void testN3() {
- T_xor_long_2addr_1 t = new T_xor_long_2addr_1();
- assertEquals(0x54321054, t.run(0xABCDEFAB, -1l));
- }
-
- /**
- * @title Types of arguments - double, long. Dalvik doens't distinguish 64-bits types internally,
- * so this (double ^ long ) makes no sense but shall not crash the VM.
- */
- public void testN4() {
- T_xor_long_2addr_2 t = new T_xor_long_2addr_2();
- try {
- t.run(3.14d, 1234l);
- } catch (Throwable e) {
- }
- }
-
-
- /**
- * @title Arguments = 0 & -1
- */
- public void testB1() {
- T_xor_long_2addr_1 t = new T_xor_long_2addr_1();
- assertEquals(-1l, t.run(0l, -1l));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MIN_VALUE
- */
- public void testB2() {
- T_xor_long_2addr_1 t = new T_xor_long_2addr_1();
- assertEquals(0xffffffff, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
- }
-
- /**
- * @title Arguments = Long.MAX_VALUE & Long.MAX_VALUE
- */
- public void testB3() {
- T_xor_long_2addr_1 t = new T_xor_long_2addr_1();
- assertEquals(0l, t.run(Long.MAX_VALUE, Long.MAX_VALUE));
- }
-
- /**
- * @constraint A24
- * @title (number of registers).
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-
-
-
- /**
- * @constraint B1
- * @title types of arguments - int, long
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title types of arguments - float, long
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B1
- * @title types of arguments - reference, long
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.d
deleted file mode 100644
index 7d84e33..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2addr_1.java
-.class public dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- xor-long/2addr v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.java b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.java
deleted file mode 100644
index f146b32..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_long_2addr.d;
-
-public class T_xor_long_2addr_1 {
-
- public long run(long a, long b) {
- return a ^ b;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.d
deleted file mode 100644
index 977ce09..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2addr_2.java
-.class public dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(DJ)J
-.limit regs 5
-
- xor-long/2addr v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.java b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.java
deleted file mode 100644
index dfa4c0f..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.opcodes.xor_long_2addr.d;
-
-public class T_xor_long_2addr_2 {
-
- public long run(double a, long b) {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3.d
deleted file mode 100644
index d578efe..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2addr_3.java
-.class public dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- const/16 v3, 1234
- xor-long/2addr v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_4.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_4.d
deleted file mode 100644
index 98c0cd8..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_4.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2addr_4.java
-.class public dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- const v3, 1234.0
- xor-long/2addr v1, v3
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5.d
deleted file mode 100644
index a69d6ca..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2addr_5.java
-.class public dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- xor-long/2addr v1, v0
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6.d b/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6.d
deleted file mode 100644
index 2533783..0000000
--- a/tools/vm-tests/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_xor_long_2addr_6.java
-.class public dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_6
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(JJ)J
-.limit regs 5
-
- xor-long/2addr v1, v5
- return-wide v1
-.end method
-
-
diff --git a/tools/vm-tests/src/dot/junit/verify/AllTests.java b/tools/vm-tests/src/dot/junit/verify/AllTests.java
deleted file mode 100644
index b4314f8..0000000
--- a/tools/vm-tests/src/dot/junit/verify/AllTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Listing of all the tests that are to be run.
- */
-public class AllTests {
-
- public static void run() {
- TestRunner.main(new String[] {AllTests.class.getName()});
- }
-
- public static final Test suite() {
- TestSuite suite = new TestSuite("Tests for dalvik vm: test that "
- + "structurally damaged files are rejected by the verifier");
- suite.addTestSuite(dot.junit.verify.a1.Test_a1.class);
- suite.addTestSuite(dot.junit.verify.a3.Test_a3.class);
- suite.addTestSuite(dot.junit.verify.a5.Test_a5.class);
- suite.addTestSuite(dot.junit.verify.b2.Test_b2.class);
- suite.addTestSuite(dot.junit.verify.b3.Test_b3.class);
- suite.addTestSuite(dot.junit.verify.b17.Test_b17.class);
-
- return suite;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/a1/Test_a1.java b/tools/vm-tests/src/dot/junit/verify/a1/Test_a1.java
deleted file mode 100644
index bf8f35e..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a1/Test_a1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.a1;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_a1 extends DxTestCase {
-
- /**
- * @constraint A1
- *
- * @title empty insns array
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.verify.a1.d.T_a1_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_1.d b/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_1.d
deleted file mode 100644
index fae89bb..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_1.d
+++ /dev/null
@@ -1,29 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_a1_1.java
-.class public dot.junit.verify.a1.d.T_a1_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 2
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_1.dfh b/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_1.dfh
deleted file mode 100644
index 2c11f5f..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_1.dfh
+++ /dev/null
@@ -1,237 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/verify/a1/d/T_a1_1.dex'...
-// Opened 'out/classes_dasm/dot/junit/verify/a1/d/T_a1_1.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : fa4f3449
- 49 34 4F FA
-// parsed: offset 12, len 20: signature : ea5e...e61c
- EA 5E DC 6D AF F0 4E 0F CA BF 0E 8F FE 43 DE 4F 78 5B E6 1C
-// parsed: offset 32, len 4: file_size : 480
- E0 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 356 (0x000164)
- 64 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 264
- 08 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 260 (0x000104) "<init>"
- 04 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 268 (0x00010c) "Ldot/junit/verify/a1/d/T_a1_1;"
- 0C 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 300 (0x00012c) "Ljava/lang/Object;"
- 2C 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 320 (0x000140) "T_a1_1.java"
- 40 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 333 (0x00014d) "V"
- 4D 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 336 (0x000150) "run"
- 50 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/verify/a1/d/T_a1_1;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/verify/a1/d/T_a1_1;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_b1_1.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 341 (0x000155)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 55 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.verify.a1.d.T_a1_1.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.verify.a1.d.T_a1_1.run"
- // parsed: offset 240, len 2: registers_size: 2
- 02 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 1
-//@mod 01 00 00 00
- 00 00 00 00
- // insns:
- // parsed: offset 256, len 2: |0000: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 258, len 2: PADDING
- 00 00
-// parsed: offset 260, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 268, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/verify/a1/d/T_a1_1;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 76 65 72 69 66 79 2F 61 31 2F 64 2F 54 5F 61 31 5F 31 3B 00
-// parsed: offset 300, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 320, len 13: TYPE_STRING_DATA_ITEM [3] "T_a1_1.java"
- 0B 54 5F 61 31 5F 31 2E 6A 61 76 61 00
-// parsed: offset 333, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 336, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/verify/a1/d/T_a1_1;"
- // parsed: offset 341, len 1: static_fields_size: 0
- 00
- // parsed: offset 342, len 1: instance_fields_size: 0
- 00
- // parsed: offset 343, len 1: direct_methods_size: 1
- 01
- // parsed: offset 344, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 345, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 346, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 349, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 351, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 352, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 353, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 355, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 356, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 360, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 372, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 384, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 396, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 408, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 420, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 432, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 444, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 260 (0x000104)
- 02 20 00 00 06 00 00 00 04 01 00 00
- // parsed: offset 456, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 341 (0x000155)
- 00 20 00 00 01 00 00 00 55 01 00 00
- // parsed: offset 468, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 356 (0x000164)
- 00 10 00 00 01 00 00 00 64 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_2.java b/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_2.java
deleted file mode 100644
index c7e6694..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a1/d/T_a1_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.a1.d;
-
-/**
- *
- */
-public class T_a1_2 {
- // dummy
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/a3/Test_a3.java b/tools/vm-tests/src/dot/junit/verify/a3/Test_a3.java
deleted file mode 100644
index 94d5cb3..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a3/Test_a3.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.a3;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_a3 extends DxTestCase {
-
- /**
- * @constraint A3
- *
- * @title The insns array must only contain valid Dalvik opcodes.
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.verify.a3.d.T_a3_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_1.d b/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_1.d
deleted file mode 100644
index 0f8d599..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_a3_1.java
-.class public dot.junit.verify.a3.d.T_a3_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 2
- nop
- nop
- nop
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_1.dfh b/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_1.dfh
deleted file mode 100644
index 0ca04de..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_1.dfh
+++ /dev/null
@@ -1,241 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/verify/a3/d/T_a3_1.dex'...
-// Opened 'out/classes_dasm/dot/junit/verify/a3/d/T_a3_1.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : be8e34ae
- AE 34 8E BE
-// parsed: offset 12, len 20: signature : 816e...af7b
- 81 6E 56 5F D0 A5 2E 3F EC 43 2E 24 E4 3D F9 E8 F6 F5 AF 7B
-// parsed: offset 32, len 4: file_size : 484
- E4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 360 (0x000168)
- 68 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 268
- 0C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 264 (0x000108) "<init>"
- 08 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 272 (0x000110) "Ldot/junit/verify/a3/d/T_a3_1;"
- 10 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 304 (0x000130) "Ljava/lang/Object;"
- 30 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 324 (0x000144) "T_a3_1.java"
- 44 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 337 (0x000151) "V"
- 51 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 340 (0x000154) "run"
- 54 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/verify/a3/d/T_a3_1;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/verify/a3/d/T_a3_1;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_a3_1.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 345 (0x000159)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 59 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.verify.a3.d.T_a3_1.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.verify.a3.d.T_a3_1.run"
- // parsed: offset 240, len 2: registers_size: 2
- 02 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 256, len 2: |0000: nop // spacer
-//@mod 00 00
- FF FF
- // parsed: offset 258, len 2: |0001: nop // spacer
- 00 00
- // parsed: offset 260, len 2: |0002: nop // spacer
- 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 264, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 272, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/verify/a3/d/T_a3_1;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 76 65 72 69 66 79 2F 61 33 2F 64 2F 54 5F 61 33 5F 31 3B 00
-// parsed: offset 304, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 324, len 13: TYPE_STRING_DATA_ITEM [3] "T_a3_1.java"
- 0B 54 5F 61 33 5F 31 2E 6A 61 76 61 00
-// parsed: offset 337, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 340, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/verify/a3/d/T_a3_1;"
- // parsed: offset 345, len 1: static_fields_size: 0
- 00
- // parsed: offset 346, len 1: instance_fields_size: 0
- 00
- // parsed: offset 347, len 1: direct_methods_size: 1
- 01
- // parsed: offset 348, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 349, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 350, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 353, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 355, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 356, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 357, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 359, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 360, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 364, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 376, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 388, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 400, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 412, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 424, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 436, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 448, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 264 (0x000108)
- 02 20 00 00 06 00 00 00 08 01 00 00
- // parsed: offset 460, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 345 (0x000159)
- 00 20 00 00 01 00 00 00 59 01 00 00
- // parsed: offset 472, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 360 (0x000168)
- 00 10 00 00 01 00 00 00 68 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_2.java b/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_2.java
deleted file mode 100644
index 9e5fbad..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a3/d/T_a3_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.a3.d;
-
-/**
- *
- */
-public class T_a3_2 {
- // dummy
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/a5/Test_a5.java b/tools/vm-tests/src/dot/junit/verify/a5/Test_a5.java
deleted file mode 100644
index e821028..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a5/Test_a5.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.a5;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_a5 extends DxTestCase {
-
- /**
- * @constraint A5
- *
- * @title The last instruction in the insns array must end at index insns_size-1.
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.verify.a5.d.T_a5_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_1.d b/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_1.d
deleted file mode 100644
index 898e900..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_a5_1.java
-.class public dot.junit.verify.a5.d.T_a5_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 2
- nop
- nop
- nop
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_1.dfh b/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_1.dfh
deleted file mode 100644
index a35f00e..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_1.dfh
+++ /dev/null
@@ -1,241 +0,0 @@
-// Processing 'out/classes_dasm/dot/junit/verify/a5/d/T_a5_1.dex'...
-// Opened 'out/classes_dasm/dot/junit/verify/a5/d/T_a5_1.dex', DEX version '035'
-// DEX file header:
-// parsed: offset 0, len 8: magic : 'dex
-// 035'
- 64 65 78 0A 30 33 35 00
-// parsed: offset 8, len 4: checksum : 1acf344e
- 4E 34 CF 1A
-// parsed: offset 12, len 20: signature : 60c2...28af
- 60 C2 30 F0 A8 17 C1 F1 B9 47 0E D8 9D BD C6 0B E9 34 28 AF
-// parsed: offset 32, len 4: file_size : 484
- E4 01 00 00
-// parsed: offset 36, len 4: header_size : 112
- 70 00 00 00
-// parsed: offset 40, len 4: endian_tag : 0x12345678
- 78 56 34 12
-// parsed: offset 44, len 4: link_size : 0
- 00 00 00 00
-// parsed: offset 48, len 4: link_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 52, len 4: map_off : 360 (0x000168)
- 68 01 00 00
-// parsed: offset 56, len 4: string_ids_size : 6
- 06 00 00 00
-// parsed: offset 60, len 4: string_ids_off : 112 (0x000070)
- 70 00 00 00
-// parsed: offset 64, len 4: type_ids_size : 3
- 03 00 00 00
-// parsed: offset 68, len 4: type_ids_off : 136 (0x000088)
- 88 00 00 00
-// parsed: offset 72, len 4: proto_ids_size : 1
- 01 00 00 00
-// parsed: offset 76, len 4: proto_ids_off : 148 (0x000094)
- 94 00 00 00
-// parsed: offset 80, len 4: field_ids_size : 0
- 00 00 00 00
-// parsed: offset 84, len 4: field_ids_off : 0 (0x000000)
- 00 00 00 00
-// parsed: offset 88, len 4: method_ids_size : 3
- 03 00 00 00
-// parsed: offset 92, len 4: method_ids_off : 160 (0x0000a0)
- A0 00 00 00
-// parsed: offset 96, len 4: class_defs_size : 1
- 01 00 00 00
-// parsed: offset 100, len 4: class_defs_off : 184 (0x0000b8)
- B8 00 00 00
-// parsed: offset 104, len 4: data_size : 268
- 0C 01 00 00
-// parsed: offset 108, len 4: data_off : 216 (0x0000d8)
- D8 00 00 00
-//
-// string_ids:
-// parsed: offset 112, len 4: [0] string_data_off: 264 (0x000108) "<init>"
- 08 01 00 00
-// parsed: offset 116, len 4: [1] string_data_off: 272 (0x000110) "Ldot/junit/verify/a5/d/T_a5_1;"
- 10 01 00 00
-// parsed: offset 120, len 4: [2] string_data_off: 304 (0x000130) "Ljava/lang/Object;"
- 30 01 00 00
-// parsed: offset 124, len 4: [3] string_data_off: 324 (0x000144) "T_a5_1.java"
- 44 01 00 00
-// parsed: offset 128, len 4: [4] string_data_off: 337 (0x000151) "V"
- 51 01 00 00
-// parsed: offset 132, len 4: [5] string_data_off: 340 (0x000154) "run"
- 54 01 00 00
-
-// type_ids:
-// parsed: offset 136, len 4: [0] descriptor_idx: 1 (0x000001) "Ldot/junit/verify/a5/d/T_a5_1;"
- 01 00 00 00
-// parsed: offset 140, len 4: [1] descriptor_idx: 2 (0x000002) "Ljava/lang/Object;"
- 02 00 00 00
-// parsed: offset 144, len 4: [2] descriptor_idx: 4 (0x000004) "V"
- 04 00 00 00
-
-// proto_ids:
-// parsed: offset 148, len 12: [0]
-// shorty_idx: 4 (0x000004) "V"
-// return_type_idx: 2 (0x000002) "V"
-// parameters_off: 0 (0x000000)
- 04 00 00 00 02 00 00 00 00 00 00 00
-
-// field_ids:
-
-// methods_ids:
-// parsed: offset 160, len 8: [0] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 00 00 00 00 00 00 00 00
-// parsed: offset 168, len 8: [1] class_idx: 0 (0x000000) proto_idx: 0 (0x000000) name_idx: 5 (0x000005) "run"
- 00 00 00 00 05 00 00 00
-// parsed: offset 176, len 8: [2] class_idx: 1 (0x000001) proto_idx: 0 (0x000000) name_idx: 0 (0x000000) "<init>"
- 01 00 00 00 00 00 00 00
-
-// class_defs:
-// parsed: offset 184, len 32: Class [0]
-// class_idx: 0 "Ldot/junit/verify/a5/d/T_a5_1;"
-// access_flags: 0x000001 (PUBLIC)
-// superclass_idx: 1 "Ljava/lang/Object;"
-// interfaces_off: 0 (0x000000)
-// source_file_idx: 3 "T_a5_1.java"
-// annotations_off: 0 (0x000000)
-// class_data_off: 345 (0x000159)
-// static_values_off: 0 (0x000000)
- 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 59 01 00 00 00 00 00 00
-// data_section:
-// CODE_ITEM for "dot.junit.verify.a5.d.T_a5_1.<init>"
- // parsed: offset 216, len 2: registers_size: 1
- 01 00
- // parsed: offset 218, len 2: ins_size: 1
- 01 00
- // parsed: offset 220, len 2: outs_size: 1
- 01 00
- // parsed: offset 222, len 2: tries_size: 0
- 00 00
- // parsed: offset 224, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 228, len 4: insns_size: 4
- 04 00 00 00
- // insns:
- // parsed: offset 232, len 6: |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
- 70 10 02 00 00 00
- // parsed: offset 238, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// CODE_ITEM for "dot.junit.verify.a5.d.T_a5_1.run"
- // parsed: offset 240, len 2: registers_size: 2
- 02 00
- // parsed: offset 242, len 2: ins_size: 1
- 01 00
- // parsed: offset 244, len 2: outs_size: 0
- 00 00
- // parsed: offset 246, len 2: tries_size: 0
- 00 00
- // parsed: offset 248, len 4: debug_info_off: 0 (0x000000)
- 00 00 00 00
- // parsed: offset 252, len 4: insns_size: 4
-//@mod 04 00 00 00
- 05 00 00 00
- // insns:
- // parsed: offset 256, len 2: |0000: nop // spacer
- 00 00
- // parsed: offset 258, len 2: |0001: nop // spacer
- 00 00
- // parsed: offset 260, len 2: |0002: nop // spacer
- 00 00
- // parsed: offset 262, len 2: |0003: return-void
- 0E 00
- // tries:
- // handlers:
-// parsed: offset 264, len 8: TYPE_STRING_DATA_ITEM [0] "<init>"
- 06 3C 69 6E 69 74 3E 00
-// parsed: offset 272, len 32: TYPE_STRING_DATA_ITEM [1] "Ldot/junit/verify/a5/d/T_a5_1;"
- 1E 4C 64 6F 74 2F 6A 75 6E 69 74 2F 76 65 72 69 66 79 2F 61 35 2F 64 2F 54 5F 61 35 5F 31 3B 00
-// parsed: offset 304, len 20: TYPE_STRING_DATA_ITEM [2] "Ljava/lang/Object;"
- 12 4C 6A 61 76 61 2F 6C 61 6E 67 2F 4F 62 6A 65 63 74 3B 00
-// parsed: offset 324, len 13: TYPE_STRING_DATA_ITEM [3] "T_a5_1.java"
- 0B 54 5F 61 35 5F 31 2E 6A 61 76 61 00
-// parsed: offset 337, len 3: TYPE_STRING_DATA_ITEM [4] "V"
- 01 56 00
-// parsed: offset 340, len 5: TYPE_STRING_DATA_ITEM [5] "run"
- 03 72 75 6E 00
-// CLASS_DATA_ITEM for class [0] "Ldot/junit/verify/a5/d/T_a5_1;"
- // parsed: offset 345, len 1: static_fields_size: 0
- 00
- // parsed: offset 346, len 1: instance_fields_size: 0
- 00
- // parsed: offset 347, len 1: direct_methods_size: 1
- 01
- // parsed: offset 348, len 1: virtual_methods_size: 1
- 01
- // static_fields:
- // instance_fields:
- // direct_methods:
- // method [0]:
- // parsed: offset 349, len 1: method_idx_diff: 0 (method_idx: 0 "<init>")
- 00
- // parsed: offset 350, len 3: access_flags: 0x010001 (PUBLIC CONSTRUCTOR)
- 81 80 04
- // parsed: offset 353, len 2: code_off: 216 (0x0000d8)
- D8 01
- // virtual_methods:
- // method [0]:
- // parsed: offset 355, len 1: method_idx_diff: 1 (method_idx: 1 "run")
- 01
- // parsed: offset 356, len 1: access_flags: 0x000001 (PUBLIC)
- 01
- // parsed: offset 357, len 2: code_off: 240 (0x0000f0)
- F0 01
-// parsed: offset 359, len 1: PADDING
- 00
-// map_list:
- // parsed: offset 360, len 4: size: 10
- 0A 00 00 00
- // parsed: offset 364, len 12: [0] type: 0x0000 TYPE_HEADER_ITEM
- // unused: 0
- // size: 1
- // offset: 0 (0x000000)
- 00 00 00 00 01 00 00 00 00 00 00 00
- // parsed: offset 376, len 12: [1] type: 0x0001 TYPE_STRING_ID_ITEM
- // unused: 0
- // size: 6
- // offset: 112 (0x000070)
- 01 00 00 00 06 00 00 00 70 00 00 00
- // parsed: offset 388, len 12: [2] type: 0x0002 TYPE_TYPE_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 136 (0x000088)
- 02 00 00 00 03 00 00 00 88 00 00 00
- // parsed: offset 400, len 12: [3] type: 0x0003 TYPE_PROTO_ID_ITEM
- // unused: 0
- // size: 1
- // offset: 148 (0x000094)
- 03 00 00 00 01 00 00 00 94 00 00 00
- // parsed: offset 412, len 12: [4] type: 0x0005 TYPE_METHOD_ID_ITEM
- // unused: 0
- // size: 3
- // offset: 160 (0x0000a0)
- 05 00 00 00 03 00 00 00 A0 00 00 00
- // parsed: offset 424, len 12: [5] type: 0x0006 TYPE_CLASS_DEF_ITEM
- // unused: 0
- // size: 1
- // offset: 184 (0x0000b8)
- 06 00 00 00 01 00 00 00 B8 00 00 00
- // parsed: offset 436, len 12: [6] type: 0x2001 TYPE_CODE_ITEM
- // unused: 0
- // size: 2
- // offset: 216 (0x0000d8)
- 01 20 00 00 02 00 00 00 D8 00 00 00
- // parsed: offset 448, len 12: [7] type: 0x2002 TYPE_STRING_DATA_ITEM
- // unused: 0
- // size: 6
- // offset: 264 (0x000108)
- 02 20 00 00 06 00 00 00 08 01 00 00
- // parsed: offset 460, len 12: [8] type: 0x2000 TYPE_CLASS_DATA_ITEM
- // unused: 0
- // size: 1
- // offset: 345 (0x000159)
- 00 20 00 00 01 00 00 00 59 01 00 00
- // parsed: offset 472, len 12: [9] type: 0x1000 TYPE_MAP_LIST
- // unused: 0
- // size: 1
- // offset: 360 (0x000168)
- 00 10 00 00 01 00 00 00 68 01 00 00
diff --git a/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_2.java b/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_2.java
deleted file mode 100644
index 5f99d46..0000000
--- a/tools/vm-tests/src/dot/junit/verify/a5/d/T_a5_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.a5.d;
-
-/**
- *
- */
-public class T_a5_2 {
- // dummy
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b17/Test_b17.java b/tools/vm-tests/src/dot/junit/verify/b17/Test_b17.java
deleted file mode 100644
index 4c14f08..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b17/Test_b17.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.b17;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_b17 extends DxTestCase {
-
- /**
- * Having throw, return and backward goto as a last opcode in the method is tested
- * as part of corresponding opcodes tests.
- */
-
- /**
- * @constraint B17
- *
- * @title attempt to leave insns array without return or throw.
- * Since this constraint is trivial to be checked by the verifier,
- * it is sufficient to have a trivial test.
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.verify.b17.d.T_b17_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b17/d/T_b17_1.d b/tools/vm-tests/src/dot/junit/verify/b17/d/T_b17_1.d
deleted file mode 100644
index 11715c2..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b17/d/T_b17_1.d
+++ /dev/null
@@ -1,30 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b17_1.java
-.class public dot.junit.verify.b17.d.T_b17_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 2
-
- const/16 v0, 123
-.end method
diff --git a/tools/vm-tests/src/dot/junit/verify/b17/d/T_b17_2.java b/tools/vm-tests/src/dot/junit/verify/b17/d/T_b17_2.java
deleted file mode 100644
index d1745e9..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b17/d/T_b17_2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.b17.d;
-
-/**
- *
- */
-public class T_b17_2 {
- // dummy
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/Test_b2.java b/tools/vm-tests/src/dot/junit/verify/b2/Test_b2.java
deleted file mode 100644
index 55ea386..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/Test_b2.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.b2;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_b2 extends DxTestCase {
-
- /**
- * @constraint B2
- * @title attempt to mess around with register-pairs.
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.verify.b2.d.T_b2_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B2
- * @title attempt to mess around with register-pairs.
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.verify.b2.d.T_b2_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B2
- * @title attempt to mess around with register-pairs.
- */
- public void testVFE3() {
- try {
- Class.forName("dot.junit.verify.b2.d.T_b2_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B2
- * @title attempt to mess around with register-pairs.
- */
- public void testVFE4() {
- try {
- Class.forName("dot.junit.verify.b2.d.T_b2_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B2
- * @title attempt to mess around with register-pairs.
- */
- public void testVFE5() {
- try {
- Class.forName("dot.junit.verify.b2.d.T_b2_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_1.d b/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_1.d
deleted file mode 100644
index 1fe908a..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b2_1.java
-.class public dot.junit.verify.b2.d.T_b2_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 123
- move v1, v0 ; illegal read access to v1
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_1.java b/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_1.java
deleted file mode 100644
index 9ca108e..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.b2.d;
-
-public class T_b2_1 {
- public void run() {
- long a = 123;
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_2.d b/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_2.d
deleted file mode 100644
index a885c41..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b2_2.java
-.class public dot.junit.verify.b2.d.T_b2_2
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const-wide v0, 123
- move v0, v1 ; // illegal read access to v0
- return-void
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_3.d b/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_3.d
deleted file mode 100644
index bf8d6e0..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_3.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b2_3.java
-.class public dot.junit.verify.b2.d.T_b2_3
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- const v0, 123
- const v1, 123
- move-wide v2, v0 ; // illegal read access to v0/1
- return-void
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_4.d b/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_4.d
deleted file mode 100644
index bb158ce..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_4.d
+++ /dev/null
@@ -1,33 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b2_4.java
-.class public dot.junit.verify.b2.d.T_b2_4
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 4
-
- const-wide v0, 123
- move v2, v0 ; // illegal read access to v0
- return-void
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_5.d b/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_5.d
deleted file mode 100644
index 483066d..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b2/d/T_b2_5.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b2_5.java
-.class public dot.junit.verify.b2.d.T_b2_5
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 5
-
- const-wide v0, 123
- move-wide v2, v0
- move-wide v2, v1 ; // illegal read access to v1/2
- return-void
-.end method
-
diff --git a/tools/vm-tests/src/dot/junit/verify/b3/Test_b3.java b/tools/vm-tests/src/dot/junit/verify/b3/Test_b3.java
deleted file mode 100644
index 1aefb11..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b3/Test_b3.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.b3;
-
-import dot.junit.DxTestCase;
-import dot.junit.DxUtil;
-
-public class Test_b3 extends DxTestCase {
-
- /**
- * @constraint B3
- * @title register (or pair) has to be assigned first before it can be read.
- */
- public void testVFE1() {
- try {
- Class.forName("dot.junit.verify.b3.d.T_b3_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- * @constraint B3
- * @title register (or pair) has to be assigned first before it can be read.
- */
- public void testVFE2() {
- try {
- Class.forName("dot.junit.verify.b3.d.T_b3_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_0.java b/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_0.java
deleted file mode 100644
index 0f0a5ce..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_0.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dot.junit.verify.b3.d;
-
-/**
-*
-*/
-public class T_b3_0 {
- // dummy
-}
diff --git a/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_1.d b/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_1.d
deleted file mode 100644
index ffcd819..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_1.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b3_1.java
-.class public dot.junit.verify.b3.d.T_b3_1
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 123
- move v2, v1
- return-void
-.end method
diff --git a/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_2.d b/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_2.d
deleted file mode 100644
index 96feb07..0000000
--- a/tools/vm-tests/src/dot/junit/verify/b3/d/T_b3_2.d
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_b3_2.java
-.class public dot.junit.verify.b3.d.T_b3_2
-.super java/lang/Object
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 10
-
- const-wide v0, 123
- long-to-int v3, v1
- return-void
-.end method
diff --git a/tools/vm-tests/src/util/build/BuildDalvikSuite.java b/tools/vm-tests/src/util/build/BuildDalvikSuite.java
deleted file mode 100644
index f08b651..0000000
--- a/tools/vm-tests/src/util/build/BuildDalvikSuite.java
+++ /dev/null
@@ -1,855 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import com.android.dx.util.FileUtils;
-
-import dot.junit.AllTests;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Map.Entry;
-import java.util.regex.MatchResult;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Main class to generate data from the test suite to later run from a shell
- * script. the project's home folder.<br>
- * <project-home>/src must contain the java sources<br>
- * <project-home>/data/scriptdata will be generated<br>
- * <project-home>/src/<for-each-package>/Main_testN1.java will be generated<br>
- * (one Main class for each test method in the Test_... class
- */
-public class BuildDalvikSuite {
-
- public static boolean DEBUG = true;
-
- private static String JAVASRC_FOLDER = "";
- private static String MAIN_SRC_OUTPUT_FOLDER = "";
-
- // the folder for the generated junit-files for the cts host (which in turn
- // execute the real vm tests using adb push/shell etc)
- private static String HOSTJUNIT_SRC_OUTPUT_FOLDER = "";
- private static String OUTPUT_FOLDER = "";
- private static String COMPILED_CLASSES_FOLDER = "";
-
- private static String CLASSES_OUTPUT_FOLDER = "";
- private static String HOSTJUNIT_CLASSES_OUTPUT_FOLDER = "";
-
- private static String CLASS_PATH = "";
-
- private static String restrictTo = null; // e.g. restrict to
- // "opcodes.add_double"
-
- private static final String TARGET_JAR_ROOT_PATH = "/data/local/tmp";
-
- private int testClassCnt = 0;
- private int testMethodsCnt = 0;
-
-
- /*
- * using a linked hashmap to keep the insertion order for iterators.
- * the junit suite/tests adding order is used to generate the order of the
- * report.
- * a map. key: fully qualified class name, value: a list of test methods for
- * the given class
- */
- private LinkedHashMap<String, List<String>> map = new LinkedHashMap<String,
- List<String>>();
-
-
- private class MethodData {
- String methodBody, constraint, title;
- }
-
- /**
- * @param args
- * args 0 must be the project root folder (where src, lib etc.
- * resides)
- * @throws IOException
- */
- public static void main(String[] args) throws IOException {
-
- if (args.length > 5) {
- JAVASRC_FOLDER = args[0];
- OUTPUT_FOLDER = args[1];
- CLASS_PATH = args[2];
- MAIN_SRC_OUTPUT_FOLDER = args[3];
- CLASSES_OUTPUT_FOLDER = MAIN_SRC_OUTPUT_FOLDER + "/classes";
-
- COMPILED_CLASSES_FOLDER = args[4];
-
- HOSTJUNIT_SRC_OUTPUT_FOLDER = args[5];
- HOSTJUNIT_CLASSES_OUTPUT_FOLDER = HOSTJUNIT_SRC_OUTPUT_FOLDER
- + "/classes";
-
- if (args.length > 6) {
- // optional: restrict to e.g. "opcodes.add_double"
- restrictTo = args[6];
- System.out.println("restricting build to: "+restrictTo);
- }
-
- } else {
- System.out
- .println("usage: java-src-folder output-folder classpath "
- + "generated-main-files compiled_output "
- + "generated-main-files [restrict-to-opcode]");
- System.exit(-1);
- }
-
- long start = System.currentTimeMillis();
- BuildDalvikSuite cat = new BuildDalvikSuite();
- cat.compose();
- long end = System.currentTimeMillis();
-
- System.out.println("elapsed seconds: " + (end - start) / 1000);
- }
-
- public void compose() throws IOException {
- System.out.println("Collecting all junit tests...");
- new TestRunner() {
- @Override
- protected TestResult createTestResult() {
- return new TestResult() {
- @Override
- protected void run(TestCase test) {
- addToTests(test);
- }
-
- };
- }
- }.doRun(AllTests.suite());
-
- // for each combination of TestClass and method, generate a Main_testN1
- // etc.
- // class in the respective package.
- // for the report make sure all N... tests are called first, then B,
- // then
- // E, then VFE test methods.
- // so we need x Main_xxxx methods in a package, and x entries in the
- // global scriptdata file (read by a bash script for the tests)
- // e.g. dxc.junit.opcodes.aaload.Test_aaload - testN1() ->
- // File Main_testN1.java in package dxc.junit.opcodes.aaload
- // and entry dxc.junit.opcodes.aaload.Main_testN1 in class execution
- // table.
- //
- handleTests();
- }
-
- private void addToTests(TestCase test) {
-
- String packageName = test.getClass().getPackage().getName();
- packageName = packageName.substring(packageName.lastIndexOf('.'));
-
-
- String method = test.getName(); // e.g. testVFE2
- String fqcn = test.getClass().getName(); // e.g.
- // dxc.junit.opcodes.iload_3.Test_iload_3
-
- // ignore all tests not belonging to the given restriction
- if (restrictTo != null && !fqcn.contains(restrictTo)) return;
-
- testMethodsCnt++;
- List<String> li = map.get(fqcn);
- if (li == null) {
- testClassCnt++;
- li = new ArrayList<String>();
- map.put(fqcn, li);
- }
- li.add(method);
- }
-
- private static final String ctsAllTestsB =
- "package dot.junit;\n" +
- "import junit.framework.Test;\n" +
- "import junit.framework.TestSuite;\n" +
- "import com.android.hosttest.DeviceTestSuite;\n" +
- "\n" +
- "public class AllJunitHostTests extends DeviceTestSuite {\n" +
- " public static final Test suite() {\n" +
- " TestSuite suite = new TestSuite(\"CTS Host tests for all " +
- " dalvik vm opcodes\");\n";
-
- private static final String ctsAllTestsE =
- " }"+
- "}";
-
- private static final String curFileDataE = "}\n";
-
-
- private String curAllTestsData = ctsAllTestsB;
- private String curJunitFileName = null;
- private String curJunitFileData = "";
-
- private JavacBuildStep javacHostJunitBuildStep;
-
- private void flushHostJunitFile() {
- if (curJunitFileName != null) {
- File toWrite = new File(curJunitFileName);
- String absPath = toWrite.getAbsolutePath();
- // add to java source files for later compilation
- javacHostJunitBuildStep.addSourceFile(absPath);
- // write file
- curJunitFileData+="\n}\n";
- writeToFileMkdir(toWrite, curJunitFileData);
- curJunitFileName = null;
- curJunitFileData = "";
- }
- }
-
- private void ctsFinish() {
- flushHostJunitFile();
- curAllTestsData+="return suite;\n}\n}\n";
- // suite is in package dot.junit.
- String allTestsFileName = HOSTJUNIT_SRC_OUTPUT_FOLDER
- + "/dot/junit/AllJunitHostTests.java";
- File toWrite = new File(allTestsFileName);
- writeToFileMkdir(toWrite, curAllTestsData);
- javacHostJunitBuildStep.addSourceFile(toWrite.getAbsolutePath());
- javacHostJunitBuildStep.addSourceFile(new File(
- HOSTJUNIT_SRC_OUTPUT_FOLDER + "/dot/junit/DeviceUtil.java").
- getAbsolutePath());
- }
-
- private void openCTSHostFileFor(String pName, String classOnlyName) {
- String sourceName = "JUnit_"+classOnlyName;
- // Add to AllTests.java
- String suiteline = "suite.addTestSuite("+pName+"." + sourceName +
- ".class);\n";
- curAllTestsData += suiteline;
- // flush previous JunitFile
- flushHostJunitFile();
-
- // prepare current testcase-file
- curJunitFileName = HOSTJUNIT_SRC_OUTPUT_FOLDER+"/"
- + pName.replaceAll("\\.","/")+"/"+sourceName+".java";
- curJunitFileData =
- "package "+pName+";\n"+
- "import java.io.IOException;\n"+
- "import junit.framework.TestCase;\n"+
- "import com.android.hosttest.DeviceTestCase;\n"+
- "import dot.junit.DeviceUtil;\n" +
- "\n" +
- "public class "+sourceName+" extends DeviceTestCase {\n";
- }
-
- private String getADBPushJavaLine(String source, String target) {
- return "DeviceUtil.adbPush(getDevice(), \"" + source + "\", \"" + target + "\");";
- }
-
- private String getADBExecJavaLine(String classpath, String mainclass) {
- return "DeviceUtil.adbExec(getDevice(), \"" + classpath + "\", \"" +
- mainclass + "\");";
- }
-
- private void addCTSHostMethod(String pName, String method, MethodData md,
- Set<String> dependentTestClassNames) {
- final String targetCoreJarPath = String.format("%s/dexcore.jar", TARGET_JAR_ROOT_PATH);
- curJunitFileData+="public void "+method+ "() throws Exception {\n";
- curJunitFileData+= " "+getADBPushJavaLine("dot/junit/dexcore.jar",
- targetCoreJarPath);
-
- // push class with Main jar.
- String mjar = "Main_"+method+".jar";
- String mainJar = String.format("%s/%s", TARGET_JAR_ROOT_PATH, mjar);
- String pPath = pName.replaceAll("\\.","/");
- //System.out.println("adb push "+pPath+"/"+mjar +" "+mainJar);
- curJunitFileData+= " "+getADBPushJavaLine(pPath+"/"+mjar, mainJar);
-
- // for each dependency:
- // adb push dot/junit/opcodes/add_double_2addr/Main_testN2.jar
- // /data/local/tmp/Main_testN2.jar
- String cp = String.format("%s:%s", targetCoreJarPath, mainJar);
- for (String depFqcn : dependentTestClassNames) {
- int lastDotPos = depFqcn.lastIndexOf('.');
- String targetName= String.format("%s/%s.jar", TARGET_JAR_ROOT_PATH,
- depFqcn.substring(lastDotPos +1));
- String sourceName = depFqcn.replaceAll("\\.", "/")+".jar";
- //System.out.println("adb push "+sourceName+" "+targetName);
- curJunitFileData+= " "+getADBPushJavaLine(sourceName, targetName);
- cp+= ":"+targetName;
- // dot.junit.opcodes.invoke_interface_range.ITest
- // -> dot/junit/opcodes/invoke_interface_range/ITest.jar
- }
-
- //"dot.junit.opcodes.add_double_2addr.Main_testN2";
- String mainclass = pName + ".Main_" + method;
- curJunitFileData+= " "+getADBExecJavaLine(cp, mainclass);
- curJunitFileData+= "}\n\n";
- }
-
- private void handleTests() throws IOException {
- System.out.println("collected "+testMethodsCnt+" test methods in " +
- testClassCnt+" junit test classes");
- String datafileContent = "";
- Set<BuildStep> targets = new TreeSet<BuildStep>();
-
- javacHostJunitBuildStep = new JavacBuildStep(
- HOSTJUNIT_CLASSES_OUTPUT_FOLDER, CLASS_PATH);
-
-
- JavacBuildStep javacBuildStep = new JavacBuildStep(
- CLASSES_OUTPUT_FOLDER, CLASS_PATH);
-
- for (Entry<String, List<String>> entry : map.entrySet()) {
-
- String fqcn = entry.getKey();
- int lastDotPos = fqcn.lastIndexOf('.');
- String pName = fqcn.substring(0, lastDotPos);
- String classOnlyName = fqcn.substring(lastDotPos + 1);
- String instPrefix = "new " + classOnlyName + "()";
-
- openCTSHostFileFor(pName, classOnlyName);
-
- List<String> methods = entry.getValue();
- Collections.sort(methods, new Comparator<String>() {
- public int compare(String s1, String s2) {
- // TODO sort according: test ... N, B, E, VFE
- return s1.compareTo(s2);
- }
- });
- for (String method : methods) {
- // e.g. testN1
- if (!method.startsWith("test")) {
- throw new RuntimeException("no test method: " + method);
- }
-
- // generate the Main_xx java class
-
- // a Main_testXXX.java contains:
- // package <packagenamehere>;
- // public class Main_testxxx {
- // public static void main(String[] args) {
- // new dxc.junit.opcodes.aaload.Test_aaload().testN1();
- // }
- // }
- MethodData md = parseTestMethod(pName, classOnlyName, method);
- String methodContent = md.methodBody;
-
- Set<String> dependentTestClassNames = parseTestClassName(pName,
- classOnlyName, methodContent);
-
- addCTSHostMethod(pName, method, md, dependentTestClassNames);
-
-
- if (dependentTestClassNames.isEmpty()) {
- continue;
- }
-
-
- String content = "//autogenerated by "
- + this.getClass().getName()
- + ", do not change\n"
- + "package "
- + pName
- + ";\n"
- + "import "
- + pName
- + ".d.*;\n"
- + "import dot.junit.*;\n"
- + "public class Main_"
- + method
- + " extends DxAbstractMain {\n"
- + " public static void main(String[] args) "
- + "throws Exception {"
- + methodContent + "\n}\n";
-
- String fileName = getFileName(pName, method, ".java");
- File sourceFile = getFileFromPackage(pName, method);
-
- File classFile = new File(CLASSES_OUTPUT_FOLDER + "/"
- + getFileName(pName, method, ".class"));
- // if (sourceFile.lastModified() > classFile.lastModified()) {
- writeToFile(sourceFile, content);
- javacBuildStep.addSourceFile(sourceFile.getAbsolutePath());
-
- BuildStep dexBuildStep = generateDexBuildStep(
- CLASSES_OUTPUT_FOLDER, getFileName(pName, method, ""));
- targets.add(dexBuildStep);
- // }
-
-
- // prepare the entry in the data file for the bash script.
- // e.g.
- // main class to execute; opcode/constraint; test purpose
- // dxc.junit.opcodes.aaload.Main_testN1;aaload;normal case test
- // (#1)
-
- char ca = method.charAt("test".length()); // either N,B,E,
- // or V (VFE)
- String comment;
- switch (ca) {
- case 'N':
- comment = "Normal #" + method.substring(5);
- break;
- case 'B':
- comment = "Boundary #" + method.substring(5);
- break;
- case 'E':
- comment = "Exception #" + method.substring(5);
- break;
- case 'V':
- comment = "Verifier #" + method.substring(7);
- break;
- default:
- throw new RuntimeException("unknown test abbreviation:"
- + method + " for " + fqcn);
- }
-
- String line = pName + ".Main_" + method + ";";
- for (String className : dependentTestClassNames) {
- line += className + " ";
- }
-
-
- // test description
- String[] pparts = pName.split("\\.");
- // detail e.g. add_double
- String detail = pparts[pparts.length-1];
- // type := opcode | verify
- String type = pparts[pparts.length-2];
-
- String description;
- if ("format".equals(type)) {
- description = "format";
- } else if ("opcodes".equals(type)) {
- // Beautify name, so it matches the actual mnemonic
- detail = detail.replaceAll("_", "-");
- detail = detail.replace("-from16", "/from16");
- detail = detail.replace("-high16", "/high16");
- detail = detail.replace("-lit8", "/lit8");
- detail = detail.replace("-lit16", "/lit16");
- detail = detail.replace("-4", "/4");
- detail = detail.replace("-16", "/16");
- detail = detail.replace("-32", "/32");
- detail = detail.replace("-jumbo", "/jumbo");
- detail = detail.replace("-range", "/range");
- detail = detail.replace("-2addr", "/2addr");
-
- // Unescape reserved words
- detail = detail.replace("opc-", "");
-
- description = detail;
- } else if ("verify".equals(type)) {
- description = "verifier";
- } else {
- description = type + " " + detail;
- }
-
- String details = (md.title != null ? md.title : "");
- if (md.constraint != null) {
- details = " Constraint " + md.constraint + ", " + details;
- }
- if (details.length() != 0) {
- details = details.substring(0, 1).toUpperCase()
- + details.substring(1);
- }
-
- line += ";" + description + ";" + comment + ";" + details;
-
- datafileContent += line + "\n";
- generateBuildStepFor(pName, method, dependentTestClassNames,
- targets);
- }
-
-
- }
-
- // write latest HOSTJUNIT generated file and AllTests.java
- ctsFinish();
-
- File scriptDataDir = new File(OUTPUT_FOLDER + "/data/");
- scriptDataDir.mkdirs();
- writeToFile(new File(scriptDataDir, "scriptdata"), datafileContent);
-
- if (!javacHostJunitBuildStep.build()) {
- System.out.println("main javac cts-host-hostjunit-classes build " +
- "step failed");
- System.exit(1);
- }
-
- if (javacBuildStep.build()) {
- for (BuildStep buildStep : targets) {
- if (!buildStep.build()) {
- System.out.println("building failed. buildStep: " +
- buildStep.getClass().getName()+", "+buildStep);
- System.exit(1);
- }
- }
- } else {
- System.out.println("main javac dalvik-cts-buildutil build step " +
- "failed");
- System.exit(1);
- }
- }
-
- private void generateBuildStepFor(String pName, String method,
- Set<String> dependentTestClassNames, Set<BuildStep> targets) {
-
-
- for (String dependentTestClassName : dependentTestClassNames) {
- generateBuildStepForDependant(dependentTestClassName, targets);
- }
- }
-
- private void generateBuildStepForDependant(String dependentTestClassName,
- Set<BuildStep> targets) {
-
- File sourceFolder = new File(JAVASRC_FOLDER);
- String fileName = dependentTestClassName.replace('.', '/').trim();
-
- if (new File(sourceFolder, fileName + ".dfh").exists()) {
-
- BuildStep.BuildFile inputFile = new BuildStep.BuildFile(
- JAVASRC_FOLDER, fileName + ".dfh");
- BuildStep.BuildFile dexFile = new BuildStep.BuildFile(
- OUTPUT_FOLDER, fileName + ".dex");
-
- DFHBuildStep buildStep = new DFHBuildStep(inputFile, dexFile);
-
- BuildStep.BuildFile jarFile = new BuildStep.BuildFile(
- OUTPUT_FOLDER, fileName + ".jar");
- JarBuildStep jarBuildStep = new JarBuildStep(dexFile,
- "classes.dex", jarFile, true);
- jarBuildStep.addChild(buildStep);
-
- targets.add(jarBuildStep);
- return;
- }
-
- if (new File(sourceFolder, fileName + ".d").exists()) {
-
- BuildStep.BuildFile inputFile = new BuildStep.BuildFile(
- JAVASRC_FOLDER, fileName + ".d");
- BuildStep.BuildFile dexFile = new BuildStep.BuildFile(
- OUTPUT_FOLDER, fileName + ".dex");
-
- DasmBuildStep buildStep = new DasmBuildStep(inputFile, dexFile);
-
- BuildStep.BuildFile jarFile = new BuildStep.BuildFile(
- OUTPUT_FOLDER, fileName + ".jar");
-
- JarBuildStep jarBuildStep = new JarBuildStep(dexFile,
- "classes.dex", jarFile, true);
- jarBuildStep.addChild(buildStep);
- targets.add(jarBuildStep);
- return;
- }
-
- if (new File(sourceFolder, fileName + ".java").exists()) {
-
- BuildStep dexBuildStep = generateDexBuildStep(
- COMPILED_CLASSES_FOLDER, fileName);
- targets.add(dexBuildStep);
- return;
- }
-
- try {
- if (Class.forName(dependentTestClassName) != null) {
-
- BuildStep dexBuildStep = generateDexBuildStep(
- COMPILED_CLASSES_FOLDER, fileName);
- targets.add(dexBuildStep);
- return;
- }
- } catch (ClassNotFoundException e) {
- // do nothing
- }
-
- throw new RuntimeException(
- "neither .dfh,.d,.java file of dependant test class found : "
- + dependentTestClassName + ";" + fileName);
- }
-
- private BuildStep generateDexBuildStep(String classFileFolder,
- String classFileName) {
- BuildStep.BuildFile classFile = new BuildStep.BuildFile(
- classFileFolder, classFileName + ".class");
-
- BuildStep.BuildFile tmpJarFile = new BuildStep.BuildFile(OUTPUT_FOLDER,
- classFileName + "_tmp.jar");
-
- JarBuildStep jarBuildStep = new JarBuildStep(classFile, classFileName
- + ".class", tmpJarFile, false);
-
- BuildStep.BuildFile outputFile = new BuildStep.BuildFile(OUTPUT_FOLDER,
- classFileName + ".jar");
-
- DexBuildStep dexBuildStep = new DexBuildStep(tmpJarFile, outputFile,
- true);
-
- dexBuildStep.addChild(jarBuildStep);
- return dexBuildStep;
-
- }
-
- /**
- * @param pName
- * @param classOnlyName
- * @param methodSource
- * @return testclass names
- */
- private Set<String> parseTestClassName(String pName, String classOnlyName,
- String methodSource) {
- Set<String> entries = new HashSet<String>();
- String opcodeName = classOnlyName.substring(5);
-
- Scanner scanner = new Scanner(methodSource);
-
- String[] patterns = new String[] {
- "new\\s(T_" + opcodeName + "\\w*)",
- "(T_" + opcodeName + "\\w*)", "new\\s(T\\w*)"};
-
- String token = null;
- for (String pattern : patterns) {
- token = scanner.findWithinHorizon(pattern, methodSource.length());
- if (token != null) {
- break;
- }
- }
-
- if (token == null) {
- System.err
- .println("warning: failed to find dependent test class name: "
- + pName
- + ", "
- + classOnlyName
- + " in methodSource:\n" + methodSource);
- return entries;
- }
-
- MatchResult result = scanner.match();
-
- entries.add((pName + ".d." + result.group(1)).trim());
-
- // search additional @uses directives
- Pattern p = Pattern.compile("@uses\\s+(.*)\\s+", Pattern.MULTILINE);
- Matcher m = p.matcher(methodSource);
- while (m.find()) {
- String res = m.group(1);
- entries.add(res.trim());
- }
-
- // lines with the form @uses
- // dot.junit.opcodes.add_double.jm.T_add_double_2
- // one dependency per one @uses
- // TODO
-
- return entries;
- }
-
- private MethodData parseTestMethod(String pname, String classOnlyName,
- String method) {
-
- String path = pname.replaceAll("\\.", "/");
- String absPath = JAVASRC_FOLDER + "/" + path + "/" + classOnlyName
- + ".java";
- File f = new File(absPath);
-
- Scanner scanner;
- try {
- scanner = new Scanner(f);
- } catch (FileNotFoundException e) {
- throw new RuntimeException("error while reading to file: "
- + e.getClass().getName() + ", msg:" + e.getMessage());
- }
-
-
- String methodPattern = "public\\s+void\\s+" + method + "[^\\{]+\\{";
-
- String token = scanner.findWithinHorizon(methodPattern, (int) f
- .length());
- if (token == null) {
- throw new RuntimeException(
- "cannot find method source of 'public void" + method
- + "' in file '" + absPath + "'");
- }
-
- MatchResult result = scanner.match();
- result.start();
- result.end();
-
- StringBuilder builder = new StringBuilder();
- //builder.append(token);
-
- try {
- FileReader reader = new FileReader(f);
- reader.skip(result.end());
-
- char currentChar;
- int blocks = 1;
- while ((currentChar = (char) reader.read()) != -1 && blocks > 0) {
- switch (currentChar) {
- case '}': {
- blocks--;
- builder.append(currentChar);
- break;
- }
- case '{': {
- blocks++;
- builder.append(currentChar);
- break;
- }
- default: {
- builder.append(currentChar);
- break;
- }
- }
- }
- if (reader != null) {
- reader.close();
- }
- } catch (Exception e) {
- throw new RuntimeException("failed to parse", e);
- }
-
- // find the @title/@constraint in javadoc comment for this method
- Scanner scanner2;
- try {
- // using platform's default charset
- scanner2 = new Scanner(f);
- } catch (FileNotFoundException e) {
- throw new RuntimeException("error while reading to file: "
- + e.getClass().getName() + ", msg:" + e.getMessage());
- }
- // using platform's default charset
- String all = new String(FileUtils.readFile(f));
- // System.out.println("grepping javadoc found for method "+method +
- // " in "+pname+","+classOnlyName);
- String commentPattern = "/\\*\\*([^{]*)\\*/\\s*" + methodPattern;
- Pattern p = Pattern.compile(commentPattern, Pattern.DOTALL);
- Matcher m = p.matcher(all);
- String title = null, constraint = null;
- if (m.find()) {
- String res = m.group(1);
- // System.out.println("res: "+res);
- // now grep @title and @constraint
- Matcher titleM = Pattern.compile("@title (.*)", Pattern.DOTALL)
- .matcher(res);
- if (titleM.find()) {
- title = titleM.group(1).replaceAll("\\n \\*", "");
- title = title.replaceAll("\\n", " ");
- title = title.trim();
- // System.out.println("title: " + title);
- } else {
- System.err.println("warning: no @title found for method "
- + method + " in " + pname + "," + classOnlyName);
- }
- // constraint can be one line only
- Matcher constraintM = Pattern.compile("@constraint (.*)").matcher(
- res);
- if (constraintM.find()) {
- constraint = constraintM.group(1);
- constraint = constraint.trim();
- // System.out.println("constraint: " + constraint);
- } else if (method.contains("VFE")) {
- System.err
- .println("warning: no @constraint for for a VFE method:"
- + method + " in " + pname + "," + classOnlyName);
- }
- } else {
- System.err.println("warning: no javadoc found for method " + method
- + " in " + pname + "," + classOnlyName);
- }
- MethodData md = new MethodData();
- md.methodBody = builder.toString();
- md.constraint = constraint;
- md.title = title;
- if (scanner != null) {
- scanner.close();
- }
- if (scanner2 != null) {
- scanner2.close();
- }
- return md;
- }
-
- private void writeToFileMkdir(File file, String content) {
- File parent = file.getParentFile();
- if (!parent.exists() && !parent.mkdirs()) {
- throw new RuntimeException("failed to create directory: " +
- parent.getAbsolutePath());
- }
- writeToFile(file, content);
- }
-
- private void writeToFile(File file, String content) {
- try {
- if (file.length() == content.length()) {
- FileReader reader = new FileReader(file);
- char[] charContents = new char[(int) file.length()];
- reader.read(charContents);
- String contents = new String(charContents);
- if (contents.equals(content)) {
- // System.out.println("skipping identical: "
- // + file.getAbsolutePath());
- return;
- }
- }
-
- //System.out.println("writing file " + file.getAbsolutePath());
-
- BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
- new FileOutputStream(file), "utf-8"));
- bw.write(content);
- bw.close();
- } catch (Exception e) {
- throw new RuntimeException("error while writing to file: "
- + e.getClass().getName() + ", msg:" + e.getMessage());
- }
- }
-
- private File getFileFromPackage(String pname, String methodName)
- throws IOException {
- // e.g. dxc.junit.argsreturns.pargsreturn
- String path = getFileName(pname, methodName, ".java");
- String absPath = MAIN_SRC_OUTPUT_FOLDER + "/" + path;
- File dirPath = new File(absPath);
- File parent = dirPath.getParentFile();
- if (!parent.exists() && !parent.mkdirs()) {
- throw new IOException("failed to create directory: " + absPath);
- }
- return dirPath;
- }
-
- private String getFileName(String pname, String methodName,
- String extension) {
- String path = pname.replaceAll("\\.", "/");
- return new File(path, "Main_" + methodName + extension).getPath();
- }
-}
diff --git a/tools/vm-tests/src/util/build/BuildStep.java b/tools/vm-tests/src/util/build/BuildStep.java
deleted file mode 100644
index dbc6bca..0000000
--- a/tools/vm-tests/src/util/build/BuildStep.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.util.HashSet;
-import java.util.Set;
-
-abstract class BuildStep implements Comparable<BuildStep> {
-
- BuildFile inputFile;
- BuildFile outputFile;
-
- static class BuildFile {
- final File folder;
- final File fileName;
-
- BuildFile(String folder, String fileName) {
- this.folder = new File(folder);
- this.fileName = new File(this.folder, fileName);
- }
-
- String getPath() {
- return fileName.getAbsolutePath();
- }
-
- @Override
- public int hashCode() {
- return fileName.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (this == obj) return true;
- if (getClass() == obj.getClass()) {
- BuildFile other = (BuildFile) obj;
- return fileName.equals(other.fileName);
- }
- return false;
- }
- }
-
- BuildStep(BuildFile inputFile, BuildFile outputFile) {
- if (inputFile == null) {
- throw new NullPointerException("inputFile is null");
- }
- if (outputFile == null) {
- throw new NullPointerException("outputFile is null");
- }
- this.inputFile = inputFile;
- this.outputFile = outputFile;
- }
-
- BuildStep() {
- }
-
- private Set<BuildStep> children;
-
- boolean build() {
- if (children != null) {
- for (BuildStep child : children) {
- if (!child.build()) {
- return false;
- }
- }
- }
- return true;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj == this) return true;
- return this.getClass() == obj.getClass();
- }
-
- @Override
- public abstract int hashCode();
-
- public void addChild(BuildStep child) {
- if (children == null) {
- children = new HashSet<BuildStep>();
- }
- children.add(child);
- }
-
- public static void copyFile(File in, File out) throws IOException {
- FileChannel inChannel = new FileInputStream(in).getChannel();
- FileChannel outChannel = new FileOutputStream(out).getChannel();
- try {
- inChannel.transferTo(0, inChannel.size(), outChannel);
- } catch (IOException e) {
- throw e;
- } finally {
- if (inChannel != null) inChannel.close();
- if (outChannel != null) outChannel.close();
- }
- }
-
- public int compareTo(BuildStep o) {
- return (inputFile == o.inputFile ? 0 : (inputFile != null
- ? (o.inputFile != null ? inputFile.getPath().compareTo(
- o.inputFile.getPath()) : 1) : -1));
- }
-}
diff --git a/tools/vm-tests/src/util/build/DFHBuildStep.java b/tools/vm-tests/src/util/build/DFHBuildStep.java
deleted file mode 100644
index 47a81bf..0000000
--- a/tools/vm-tests/src/util/build/DFHBuildStep.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import dxconvext.ClassFileAssembler;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.OutputStream;
-import java.io.Reader;
-
-public class DFHBuildStep extends BuildStep {
-
- public DFHBuildStep(BuildFile inputFile, BuildFile outputFile) {
- super(inputFile, outputFile);
- }
-
- @Override
- boolean build() {
- if (super.build()) {
- File out_dir = outputFile.fileName.getParentFile();
- if (!out_dir.exists() && !out_dir.mkdirs()) {
- System.err.println("failed to create dir: "
- + out_dir.getAbsolutePath());
- return false;
- }
-
- ClassFileAssembler cfAssembler = new ClassFileAssembler();
- Reader r;
- OutputStream os;
- try {
- r = new FileReader(inputFile.fileName);
- os = new FileOutputStream(outputFile.fileName);
- } catch (FileNotFoundException e) {
- System.err.println(e);
- return false;
- }
- try {
- // cfAssembler throws a runtime exception
- cfAssembler.writeClassFile(r, os, true);
- } catch (RuntimeException e) {
- System.err.println("error in DFHBuildStep for inputfile "+inputFile.fileName+", outputfile "+outputFile.fileName);
- throw e;
- }
-
- return true;
- }
- return false;
- }
-
- @Override
- public boolean equals(Object obj) {
-
- if (super.equals(obj)) {
- return inputFile.equals(((DFHBuildStep) obj).inputFile)
- && outputFile.equals(((DFHBuildStep) obj).outputFile);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return (inputFile == null ? 31 : inputFile.hashCode())
- ^ (outputFile == null ? 37 : outputFile.hashCode());
- }
-}
diff --git a/tools/vm-tests/src/util/build/DasmBuildStep.java b/tools/vm-tests/src/util/build/DasmBuildStep.java
deleted file mode 100644
index b77a491..0000000
--- a/tools/vm-tests/src/util/build/DasmBuildStep.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import dasm.DAsm;
-import dasm.DasmError;
-import dasm.Utils;
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-class DasmBuildStep extends BuildStep {
-
-
- boolean generate_linenum = false;
-
- DasmBuildStep(BuildFile inputFile, BuildFile outputFile) {
- super(inputFile, outputFile);
-
- }
-
- @Override
- boolean build() {
- if (super.build()) {
- return assemble(inputFile.fileName);
- }
- return false;
- }
-
- private static Reader createReader(String fname) throws IOException {
- FileInputStream fs = new FileInputStream(fname);
- InputStreamReader ir;
- ir = new InputStreamReader(fs);
- return new BufferedReader(ir);
- }
-
- private boolean assemble(File file) {
- DAsm dAsm = new DAsm();
- String fname = file.getAbsolutePath();
-
- // read and parse .d file
- Reader inp = null;
- try {
- inp = createReader(fname);
- dAsm.readD(inp, new File(fname).getName(), generate_linenum);
- close(inp);
- } catch(DasmError e) {
- if(BuildDalvikSuite.DEBUG)
- e.printStackTrace();
- System.err.println("DASM Error: " + e.getMessage());
- } catch(Exception e) {
- if(BuildDalvikSuite.DEBUG)
- e.printStackTrace();
- System.err.println("Exception <" + e.getClass().getName() + ">" + e.getMessage() +
- " while reading and parsing " + fname);
- return false;
-
- }
- finally {
- close(inp);
- }
-
- if(dAsm.errorCount() > 0) {
- System.err.println("Found " + dAsm.errorCount() + " errors " +
- " while reading and parsing " + fname);
- return false;
- }
-
- String class_path[] = Utils.getClassFieldFromString(dAsm.getClassName());
- String class_name = class_path[1];
-
- // determine where to place .dex file
- String dest_dir = outputFile.folder.getAbsolutePath();
- if (class_path[0] != null) {
- String class_dir = class_path[0].replaceAll("/|\\.", Character.toString(File.separatorChar));
- if (dest_dir != null) {
- dest_dir = dest_dir + File.separator + class_dir;
- } else {
- dest_dir = class_dir;
- }
- }
-
- File out_file = null;
-
- if (dest_dir == null) {
- out_file = new File(class_name + ".dex");
- } else {
- out_file = new File(dest_dir, class_name + ".dex");
-
- // check that dest_dir exists
- File dest = new File(dest_dir);
- if (!dest.exists()) {
- dest.mkdirs();
- }
-
- if (!dest.isDirectory()) {
- System.err.println("Cannot create directory " + dest_dir);
- return false;
- }
- }
-
- // write output
- FileOutputStream outp = null;
-
- try {
- outp = new FileOutputStream(out_file);
- dAsm.write(outp, null);
- } catch(Exception e) {
- if(BuildDalvikSuite.DEBUG)
- e.printStackTrace();
- System.err.println("Exception <" + e.getClass().getName() + ">" + e.getMessage() +
- " while writing " + out_file.getPath());
-
- close(outp);
-
- out_file.delete();
-
- return false;
- }
- finally {
- close(outp);
- }
-
- return true;
- }
-
- private static void close(Closeable c) {
- if(c == null)
- return;
- try {
- c.close();
- } catch(IOException e) {
-
- }
- }
-
- @Override
- public boolean equals(Object obj) {
- if (super.equals(obj)) {
- DasmBuildStep other = (DasmBuildStep) obj;
-
- return inputFile.equals(other.inputFile)
- && generate_linenum == other.generate_linenum
- && outputFile.equals(other.outputFile);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return inputFile.hashCode() ^ outputFile.hashCode()
- ^ (generate_linenum ? 31 : 37);
- }
-}
diff --git a/tools/vm-tests/src/util/build/DeviceUtil.java.template b/tools/vm-tests/src/util/build/DeviceUtil.java.template
deleted file mode 100644
index a8461cf..0000000
--- a/tools/vm-tests/src/util/build/DeviceUtil.java.template
+++ /dev/null
@@ -1,120 +0,0 @@
-
-package dot.junit;
-
-
-import com.android.ddmlib.IDevice;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Scanner;
-
-public class DeviceUtil {
-
- private static boolean DEBUG = System.getProperty("cts.vm-tests.debug") != null;
-
- /**
- * Executes the command and its arguments in a native process.
- *
- * @param commandAndArgs a string array to be passed containing the
- * executable and its arguments
- * @param okIndicator if not null, this String must occur in the stdout of
- * the executable (since only checking for the return code is not
- * sufficient e.g. for adb shell cmd)
- * @throws Exception thrown by the underlying command in case of an error.
- */
- public static void digestCommand(String[] commandAndArgs, String okIndicator) {
- RuntimeException re = null;
- try {
- String c = "";
- for (int i = 0; i < commandAndArgs.length; i++) {
- c += commandAndArgs[i] + " ";
- }
- if (DEBUG) System.out.print("com: " + c);
- StringBuilder sb = new StringBuilder();
- ProcessBuilder pb = new ProcessBuilder(commandAndArgs).redirectErrorStream(true);
- Process p = pb.start();
-
- InputStream is = p.getInputStream();
- Scanner scanner = new Scanner(is);
- int retCode = p.waitFor();
- while (scanner.hasNextLine()) {
- sb.append(scanner.nextLine());
- }
- scanner.close();
- if (retCode != 0 || (okIndicator != null && !sb.toString().contains(okIndicator))) {
- String msg = sb.toString() + "\nreturn code: " + retCode;
- re = new RuntimeException(msg);
- if (DEBUG) System.out.println("-> error! msg:"+msg);
- } else {
- if (DEBUG) System.out.println(" -> " + retCode);
- }
- } catch (Exception e) {
- throw new RuntimeException("Exception occurred: " + e.getClass().getName() + ", msg:"
- + e.getMessage());
- } finally {
- if (re != null) {
- throw re;
- }
- }
- }
-
- public static String createFilePath(String testName) throws IOException {
- // e.g. /dot/junit/opcodes/add_double/d/T_add_double_1.jar
- FileOutputStream fos = null;
- InputStream is = null;
- File f;
- try {
- is = DeviceUtil.class.getResourceAsStream("/tests/" + testName);
- if (is == null) {
- throw new RuntimeException("could not find resource /tests" + testName
- + " in classpath");
- }
- f = File.createTempFile("cts-adbpush-", ".jar");
- int len = 4096;
- byte[] bytes = new byte[len];
- fos = new FileOutputStream(f);
- int b;
- while ((b = is.read(bytes)) > 0) {
- fos.write(bytes, 0, b);
- }
- } finally {
- if (is != null) {
- is.close();
- }
- if (fos != null) {
- fos.close();
- }
- }
- return f.getAbsolutePath();
- }
-
- public static void adbPush(IDevice device, String source, String target)
- throws IOException {
- String tmp_source = null;
- try {
- tmp_source = DeviceUtil.createFilePath(source);
- DeviceUtil.digestCommand(new String[] {"adb", "-s", device.getSerialNumber(), "push",
- tmp_source, target}, null);
- } finally {
- // Clean up local temp file after pushing it to device.
- if (tmp_source != null) {
- File f = new File(tmp_source);
- if (f.exists()) {
- f.delete();
- }
- }
- }
- }
-
- public static void adbExec(IDevice device, String classpath, String mainclass) {
- DeviceUtil.digestCommand(new String[] {"adb", "-s", device.getSerialNumber(), "shell",
- "mkdir", "/data/local/tmp/dalvik-cache"}, null);
- DeviceUtil.digestCommand(new String[] {"adb", "-s", device.getSerialNumber(), "shell",
- "ANDROID_DATA=/data/local/tmp", "dalvikvm", "-Xint:portable", "-Xmx512M", "-Xss32K",
- "-Djava.io.tmpdir=/data/local/tmp", "-classpath", classpath, mainclass, "&&",
- "echo", "mk_dalvikvmok" }, "mk_dalvikvmok");
- }
- }
diff --git a/tools/vm-tests/src/util/build/DexBuildStep.java b/tools/vm-tests/src/util/build/DexBuildStep.java
deleted file mode 100644
index 6aba51c..0000000
--- a/tools/vm-tests/src/util/build/DexBuildStep.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import com.android.dx.command.dexer.Main;
-import java.io.IOException;
-
-public class DexBuildStep extends BuildStep {
-
- private final boolean deleteInputFileAfterBuild;
-
- DexBuildStep(BuildFile inputFile, BuildFile outputFile,
- boolean deleteInputFileAfterBuild) {
- super(inputFile, outputFile);
- this.deleteInputFileAfterBuild = deleteInputFileAfterBuild;
- }
-
- @Override
- boolean build() {
-
- if (super.build()) {
- Main.Arguments args = new Main.Arguments();
-
- args.jarOutput = true;
- args.fileNames = new String[] {inputFile.fileName.getAbsolutePath()};
-
- args.outName = outputFile.fileName.getAbsolutePath();
-
- int result = 0;
- try {
- result = Main.run(args);
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
-
- if (result == 0) {
- if (deleteInputFileAfterBuild) {
- inputFile.fileName.delete();
- }
- return true;
- } else {
- System.err.println("exception while dexing "
- + inputFile.fileName.getAbsolutePath() + " to "
- + args.outName);
- return false;
- }
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return inputFile.hashCode() ^ outputFile.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (super.equals(obj)) {
- DexBuildStep other = (DexBuildStep) obj;
-
- return inputFile.equals(other.inputFile)
- && outputFile.equals(other.outputFile);
- }
- return false;
- }
-
-
-}
diff --git a/tools/vm-tests/src/util/build/JarBuildStep.java b/tools/vm-tests/src/util/build/JarBuildStep.java
deleted file mode 100644
index 776e905..0000000
--- a/tools/vm-tests/src/util/build/JarBuildStep.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import sun.tools.jar.Main;
-
-import java.io.File;
-import java.io.IOException;
-
-
-public class JarBuildStep extends BuildStep {
-
- String destFileName;
- private final boolean deleteInputFileAfterBuild;
-
- public JarBuildStep(BuildFile inputFile, String destFileName,
- BuildFile outputFile, boolean deleteInputFileAfterBuild) {
- super(inputFile, outputFile);
- this.destFileName = destFileName;
- this.deleteInputFileAfterBuild = deleteInputFileAfterBuild;
- }
-
- @Override
- boolean build() {
- if (super.build()) {
- File tempFile = new File(inputFile.folder, destFileName);
- try {
- if (!inputFile.fileName.equals(tempFile)) {
- copyFile(inputFile.fileName, tempFile);
- } else {
- tempFile = null;
- }
- } catch (IOException e) {
- System.err.println("io exception:"+e.getMessage());
- e.printStackTrace();
- return false;
- }
-
- File outDir = outputFile.fileName.getParentFile();
- if (!outDir.exists() && !outDir.mkdirs()) {
- System.err.println("failed to create output dir: "
- + outDir.getAbsolutePath());
- return false;
- }
- String[] arguments = new String[] {
- "-cMf", outputFile.fileName.getAbsolutePath(), "-C",
- inputFile.folder.getAbsolutePath(), destFileName};
- Main main = new Main(System.out, System.err, "jar");
- boolean success = main.run(arguments);
-
- if (success) {
- if (tempFile != null) {
- tempFile.delete();
- }
- if (deleteInputFileAfterBuild) {
- inputFile.fileName.delete();
- }
- } else {
- System.err.println("exception in JarBuildStep while calling jar with args:" +
- " \"-cMf\", "+outputFile.fileName.getAbsolutePath()+", \"-C\"," +
- inputFile.folder.getAbsolutePath()+", "+ destFileName);
- }
- return success;
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return inputFile.hashCode() ^ outputFile.hashCode()
- ^ destFileName.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (super.equals(obj)) {
- JarBuildStep other = (JarBuildStep) obj;
- return inputFile.equals(other.inputFile)
- && outputFile.equals(other.outputFile)
- && destFileName.equals(other.destFileName);
-
- }
- return false;
- }
-
-}
diff --git a/tools/vm-tests/src/util/build/JavacBuildStep.java b/tools/vm-tests/src/util/build/JavacBuildStep.java
deleted file mode 100644
index 7d7033f..0000000
--- a/tools/vm-tests/src/util/build/JavacBuildStep.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package util.build;
-
-import com.sun.tools.javac.Main;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Set;
-
-public class JavacBuildStep extends BuildStep {
-
- private final String destPath;
- private final String classPath;
- private final Set<String> sourceFiles = new HashSet<String>();
- public JavacBuildStep(String destPath, String classPath) {
- this.destPath = destPath;
- this.classPath = classPath;
- }
-
- public void addSourceFile(String sourceFile)
- {
- sourceFiles.add(sourceFile);
- }
-
- @Override
- boolean build() {
- if (super.build())
- {
- if (sourceFiles.isEmpty())
- {
- return true;
- }
-
- File destFile = new File(destPath);
- if (!destFile.exists() && !destFile.mkdirs())
- {
- System.err.println("failed to create destination dir");
- return false;
- }
- int args = 4;
- String[] commandLine = new String[sourceFiles.size()+args];
- commandLine[0] = "-classpath";
- commandLine[1] = classPath;
- commandLine[2] = "-d";
- commandLine[3] = destPath;
-
- String[] files = new String[sourceFiles.size()];
- sourceFiles.toArray(files);
-
- System.arraycopy(files, 0, commandLine, args, files.length);
-
-
- return Main.compile(commandLine, new PrintWriter(System.err)) == 0;
- }
- return false;
- }
-
- @Override
- public boolean equals(Object obj) {
- // TODO Auto-generated method stub
- if (super.equals(obj))
- {
- JavacBuildStep other = (JavacBuildStep) obj;
- return destPath.equals(other.destPath)
- && classPath.equals(other.classPath)
- && sourceFiles.equals(other.sourceFiles);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return destPath.hashCode() ^ classPath.hashCode() ^ sourceFiles.hashCode();
- }
-}
diff --git a/tools/vm-tests/vm-tests.css b/tools/vm-tests/vm-tests.css
deleted file mode 100644
index a315a73..0000000
--- a/tools/vm-tests/vm-tests.css
+++ /dev/null
@@ -1,59 +0,0 @@
-h1 {
- font-family: serif;
- color: #222266;
-}
-
-h2 {
- font-family: serif;
- border-top-style: solid;
- border-top-width: 2px;
- border-color: #ccccdd;
- padding-top: 12px;
- margin-top: 48px;
- margin-bottom: 2px;
- color: #222266;
-}
-
-@media print {
- table {
- font-size: 8pt;
- }
-}
-
-@media screen {
- table {
- font-size: 10pt;
- }
-}
-
-
-/* general for all tables */
-
-table {
- border-collapse: collapse;
- margin-top: 24px;
- margin-bottom: 24px;
- margin-left: 48px;
- margin-right: 48px;
-}
-
-table th {
- font-family: sans-serif;
- background: #aabbff;
- text-align: left;
-}
-
-table td {
- font-family: sans-serif;
- border-top-style: solid;
- border-bottom-style: solid;
- border-width: 1px;
- border-color: #aaaaff;
- padding-top: 4px;
- padding-bottom: 4px;
- padding-left: 4px;
- padding-right: 6px;
- background: #eeeeff;
- margin-top: 4pt;
- margin-bottom: 0pt;
-}
diff --git a/tools/vm-tests/vm-tests.html b/tools/vm-tests/vm-tests.html
deleted file mode 100644
index 1b1e351..0000000
--- a/tools/vm-tests/vm-tests.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
- <head>
- <title>Dalvik VM Test Suite</title>
- <link rel=stylesheet href="vm-tests.css">
- </head>
-
- <body>
- <h1>Dalvik VM Test Suite</h1>
- <p>Version 1.0</p>
- <p>Copyright © 2008 The Android Open Source Project
-
- <h2>Overview</h2>
-
- <p>
- This directory contains a test suite for the Dalvik VM. It tests the
- capabilities of the Dalvik VM in a black-box manner, based on the Dalvik
- bytecode and <code>.dex</code> file format specifications. The suite does
- both functional and verifier tests. Regarding the latter, the Dalvik VM is
- supposed to perform bytecode verification equivalent to that done in other
- virtual machines. Please see
-
- <pre>
- docs/dalvik/dalvik-bytecode.html
- docs/dalvik/dalvik-constraints.html
- docs/dalvik/dex-format.html
- docs/dalvik/verifier.html
- </pre>
-
- for further details.
- </p>
-
- <h2>How to build</h2>
-
- <p>
- The test suite is normally included in a full build of the Android
- project. If it needs to be built individually, a simple
-
- <pre>
- make vm-tests
- </pre>
-
- or an
-
- <pre>
- mm
- </pre>
-
- in this directory will do.
- </p>
-
- <h2>How to run</h2>
-
- <p>
- The suite can be invoked by executing
-
- <pre>
- vm-tests
- </pre>
-
- from any location, assuming the suite has been built. This will run
- all tests. If you want to limit the suite to the test cases
- corresponding to a single instruction, you can specifiy the mnemonic
- as a parameter. For example
-
- <pre>
- vm-tests add-int/lit16
- </pre>
-
- executes the tests for the <code>add-int/lit16</code> instruction.
- Please see the Dalvik VM specification for all the mnemonics. Two
- additional parameters are possible that don't represent instructions.
- These run integrity tests for the DEX file format and general
- verifier tests, respectively:
-
- <pre>
- vm-tests format
- vm-tests verifier
- </pre>
-
- The suite is normally run for the fast version of the interpreter. To run
- it for the portable interpreter, pass <code>--portable</code> as the first
- parameter. Passing <code>--help</code> results in a brief overview of the
- options.
- </p>
-
- <p>
- The suite is compatible with both emulator and simulator
- builds. For an emulator build, please make sure you have
- either an emulator running or a device attached via USB before
- invoking the test suite.
- </p>
-
- <p>
- The full suite might easily take 30 minutes or more for execution,
- depending on the environment. It will generate an HTML
- report with details on all test cases. While running, console output
- is produced to give a quick impression of the progress and results.
- For both types of output, each individual test result falls into one of
- the following categories:
- </p>
-
- <table>
- <tr>
- <th>Type in report</th><th>Type on console</th><th>Description</th>
- </tr>
- <tr>
- <td>Success</td>
- <td>.</td>
- <td>
- The test case passed successfully.
- </td>
- </tr>
- <tr>
- <td>Functional failure</td>
- <td>F</td>
- <td>
- A functional (normal or boundary) or an exception test case
- failed.
- </td>
- </tr>
- <tr>
- <td>Verifier failure</td>
- <td>V</td>
- <td>
- A verifier test case failed. Either the verifier accepted
- some invalid piece of code or it rejected a valid one.
- </td>
- </tr>
- <tr>
- <td>Console error</td>
- <td>C</td>
- <td>
- The process running the VM returned error messages on the
- standard output or error stream, but it is not clear what the
- nature of the problem is. The test case is considered a failure,
- though. This problem should only occur when running the suite on
- a simulator build.
- </td>
- </tr>
- </table>
- </body>
-</html>
